Menu
▾
▴
wigwam-test-cvs — CVS commits for the wigwam-test module.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(5) |
Nov
|
Dec
|
|
From: fess <fe...@us...> - 2003-10-15 04:43:40
|
Update of /cvsroot/wigwam/wigwam-test
In directory sc8-pr-cvs1:/tmp/cvs-serv8248
Modified Files:
run-test
Log Message:
re arrange tests to die on trival stuff more quickly up front.
and leave the more time consuming stuff till later.
also add lsof support to --kill
Index: run-test
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/run-test,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- run-test 9 Oct 2003 04:36:20 -0000 1.47
+++ run-test 15 Oct 2003 04:43:36 -0000 1.48
@@ -1,5 +1,6 @@
#! /bin/sh
+id=`basename $0`
usage="usage: $0 [options]
Run the wigwam test cases.
@@ -101,13 +102,20 @@
;;
--kill)
fuser=`which fuser`
+ lsof=`which lsof`
if test -r "$fuser"; then
"$fuser" -k -n tcp "$MASTER_HELLOD_PORT"
"$fuser" -k -n tcp "$MASTER_HUPCOUNTD_PORT"
+ elif test -r "$lsof"; then
+ pids=` "$lsof" -t \
+ -i tcp:$MASTER_HUPCOUNTD_PORT \
+ -i tcp:$MASTER_HELLOD_PORT
+ `
+ test "x$pids" = "x" || kill $pids
else
# TODO: do trickery to spot the programs
# and kill the right things some other way.
- echo "--kill Sorry can't kill old procs. no fuser. " \
+ echo "$id: --kill Sorry can't kill old procs. no fuser. " \
"write some code here."
fi
;;
@@ -210,16 +218,36 @@
shift
done
-LOGFILE="$WWTEST_DIR/test$$.log"
-rm -f $LOGFILE
-touch "$LOGFILE" || {
- echo "$id: error creating $LOGFILE" 1>&2
- { die ; }
+
+##
+## setup functions.
+##
+
+# a function to log a new section in the LOGFILE.
+new_section () {
+ echo \
+"#=====================================================================
+# $1
+#=====================================================================" \
+ >> $LOGFILE
+ if test "$verbose" = 1 ; then
+ echo "$id: $1" 1>&2
+ fi
}
-if test "$quiet" = "0" ; then
- echo "(Using $LOGFILE for debugging logs)" 1>&2
-fi
+die () {
+ if test "x$1" = "x" ; then
+ echo "$id: TEST FAILED!" >> $LOGFILE
+ else
+ echo "$id: TEST FAILED: $1!" >> $LOGFILE
+ fi
+ echo "*** TEST FAILED" 1>&2
+ exit 1
+}
+
+##
+## find commands we depend on.
+##
# pick various versions...
if test -r /usr/xpg4/bin/grep ; then
@@ -237,6 +265,58 @@
export fgrep
export ungzip
+
+##
+## Do checks
+##
+
+unset PLAYPEN_ROOT
+cd "$WWTEST_DIR"
+
+LOGFILE="$WWTEST_DIR/test$$.log"
+rm -f $LOGFILE
+touch "$LOGFILE" || {
+ echo "$id: error creating $LOGFILE" 1>&2
+ exit 1;
+}
+
+# we need ports MASTER_HELLOD_PORT and MASTER_HUPCOUNTD_PORT clear.
+test "x$DISABLE_NETSTAT_CHECKS" = x1 || {
+ # determine the availability of netstat.
+ if echo "x$NETSTAT" | egrep "^x/" ; then
+ netstat_path="$NETSTAT"
+ else
+ netstat_path=`cd / ; which netstat 2>&1`
+ fi
+ test -x "$netstat_path" || {
+ echo "$0: sorry, netstat is not found." 1>&2
+ echo "$0: if your environment does not support netstat" 1>&2
+ echo "$0: try setting \$DISABLE_NETSTAT_CHECKS=1" 1>&2
+ exit 1
+ }
+
+ needed_port_in_use=0
+ for port in "$MASTER_HELLOD_PORT" "$MASTER_HUPCOUNTD_PORT" ; do
+ "$netstat_path" -an | $fgrep LISTEN | $egrep '^tcp' | $egrep -q $port && {
+ echo "$id: ***ERROR*** Port $port is in use. I cannot deal with this. (try --kill)" 1>&2
+ needed_port_in_use=1
+ exit 1
+ }
+ done
+ test "$needed_port_in_use" = "1" && { die ; }
+}
+
+# ok, we should be run from the wigwam-test project.
+test -r "$WWTEST_DIR/run-test" || {
+ echo "$id: must be in wigwam-test directory" 1>&2
+ { die ; }
+}
+
+
+if test "$quiet" = "0" ; then
+ echo "(Using $LOGFILE for debugging logs)" 1>&2
+fi
+
# Build wigwam-packaging-utils tarball
# from a source directory.
test "x$wpamu_srcdir" = x || {
@@ -294,65 +374,6 @@
wpamu_version=`basename "$wpamu_tarball" | \
sed -e 's/wigwam-packaging-utils-//; s/\\.tar\\.gz//;'`
-id=`basename $0`
-
-# a function to log a new section in the LOGFILE.
-new_section () {
- echo \
-"#=====================================================================
-# $1
-#=====================================================================" \
- >> $LOGFILE
- if test "$verbose" = 1 ; then
- echo "$id: $1" 1>&2
- fi
-}
-
-die () {
- if test "x$1" = "x" ; then
- echo "$id: TEST FAILED!" >> $LOGFILE
- else
- echo "$id: TEST FAILED: $1!" >> $LOGFILE
- fi
- echo "*** TEST FAILED" 1>&2
- exit 1
-}
-
-unset PLAYPEN_ROOT
-
-# ok, we should be run from the wigwam-test project.
-cd "$WWTEST_DIR"
-test -r "$WWTEST_DIR/run-test" || {
- echo "$id: must be in wigwam-test directory" 1>&2
- { die ; }
-}
-
-
-# we need ports MASTER_HELLOD_PORT and MASTER_HUPCOUNTD_PORT clear.
-test "x$DISABLE_NETSTAT_CHECKS" = x1 || {
- # determine the availability of netstat.
- if echo "x$NETSTAT" | egrep "^x/" ; then
- netstat_path="$NETSTAT"
- else
- netstat_path=`cd / ; which netstat 2>&1`
- fi
- test -x "$netstat_path" || {
- echo "$0: sorry, netstat is not found." 1>&2
- echo "$0: if your environment does not support netstat" 1>&2
- echo "$0: try setting \$DISABLE_NETSTAT_CHECKS=1" 1>&2
- exit 1
- }
-
- needed_port_in_use=0
- for port in "$MASTER_HELLOD_PORT" "$MASTER_HUPCOUNTD_PORT" ; do
- "$netstat_path" -an | $fgrep LISTEN | $egrep '^tcp' | $egrep -q $port && {
- echo "$id: ***ERROR*** Port $port is in use. I cannot deal with this. (try --kill)" 1>&2
- needed_port_in_use=1
- exit 1
- }
- done
- test "$needed_port_in_use" = "1" && { die ; }
-}
export WWTEST_DIR LOGFILE
|
|
From: fess <fe...@us...> - 2003-10-14 16:18:25
|
Update of /cvsroot/wigwam/wigwam-test/dummy-package-archive/bin In directory sc8-pr-cvs1:/tmp/cvs-serv5382/dummy-package-archive/bin Modified Files: make-trivial-package Log Message: holy jeezus. there was a space after the '#! /bin/sh -x' this broke the script on OSX. ( which uses bash a si it's sh so that's pretty weird. cause so does linux. ) anyhow.. one step closer to being able to run the wigwam-tests on osx. Index: make-trivial-package =================================================================== RCS file: /cvsroot/wigwam/wigwam-test/dummy-package-archive/bin/make-trivial-package,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- make-trivial-package 22 Dec 2000 17:46:34 -0000 1.5 +++ make-trivial-package 14 Oct 2003 16:18:20 -0000 1.6 @@ -1,4 +1,4 @@ -#! /bin/sh -x +#! /bin/sh -x package_name="" package_version="" |
|
From: fess <fe...@us...> - 2003-10-09 04:36:25
|
Update of /cvsroot/wigwam/wigwam-test
In directory sc8-pr-cvs1:/tmp/cvs-serv1075
Modified Files:
run-test
Log Message:
don't got fuser. don't run fuser
Index: run-test
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/run-test,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- run-test 9 Oct 2003 04:29:20 -0000 1.46
+++ run-test 9 Oct 2003 04:36:20 -0000 1.47
@@ -71,7 +71,6 @@
export MASTER_HUPCOUNTD_PORT
fi
-
# and we want tags to include a second counter.
WIGWAM_TAG_DATE_FORMAT_STRING='%Y%m%d%H%M%S'
export WIGWAM_TAG_DATE_FORMAT_STRING
@@ -101,8 +100,16 @@
export RUN_TEST_LIST_VERBOSE
;;
--kill)
- fuser -k -n tcp "$MASTER_HELLOD_PORT"
- fuser -k -n tcp "$MASTER_HUPCOUNTD_PORT"
+ fuser=`which fuser`
+ if test -r "$fuser"; then
+ "$fuser" -k -n tcp "$MASTER_HELLOD_PORT"
+ "$fuser" -k -n tcp "$MASTER_HUPCOUNTD_PORT"
+ else
+ # TODO: do trickery to spot the programs
+ # and kill the right things some other way.
+ echo "--kill Sorry can't kill old procs. no fuser. " \
+ "write some code here."
+ fi
;;
--quiet)
quiet=1
|
|
From: fess <fe...@us...> - 2003-10-09 04:29:23
|
Update of /cvsroot/wigwam/wigwam-test In directory sc8-pr-cvs1:/tmp/cvs-serv32747 Modified Files: run-test Log Message: these lines don't appear to be used at all. Index: run-test =================================================================== RCS file: /cvsroot/wigwam/wigwam-test/run-test,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- run-test 3 Oct 2003 03:21:14 -0000 1.45 +++ run-test 9 Oct 2003 04:29:20 -0000 1.46 @@ -52,19 +52,6 @@ quiet=0 verbose=0 -# where the bootstrap script may be downloaded from. -# hmm.. -if test "x$wigwam_download_base" = x ; then - wigwam_download_base=http://downloads.idealab.com/wigwam-base -fi - -# the version of wigwam to use. -# XXX: we should detect the latest version. -if test "x$wwversion" = x ; then - wwversion=3.0.23 -fi -wwrelease=1 - # we can't edit files. EDITOR=true export EDITOR |
|
From: fess <fe...@us...> - 2003-10-03 03:21:25
|
Update of /cvsroot/wigwam/wigwam-test
In directory sc8-pr-cvs1:/tmp/cvs-serv2874
Modified Files:
run-test
Log Message:
remove changes from 1.44
we do want to test autgen without a role.
Index: run-test
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/run-test,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- run-test 24 Sep 2003 05:12:15 -0000 1.44
+++ run-test 3 Oct 2003 03:21:14 -0000 1.45
@@ -611,11 +611,9 @@
CVSMODULE="$playpen_name"
export CVSMODULE
-
# 9.d. Bootstrap the project
echo "#### Running autogen.sh" >> $LOGFILE
cd $PLAYPEN_DIR || { die ; }
-echo 'developer' > etc/role
./autogen.sh >> $LOGFILE 2>&1 || { die ; }
#=====================================================================
|
|
From: fess <fe...@us...> - 2003-09-24 05:12:18
|
Update of /cvsroot/wigwam/wigwam-test
In directory sc8-pr-cvs1:/tmp/cvs-serv30066
Modified Files:
run-test
Log Message:
must have a role file first now as of 3.0.49.2 should have always required this
Index: run-test
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/run-test,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- run-test 26 May 2003 01:32:55 -0000 1.43
+++ run-test 24 Sep 2003 05:12:15 -0000 1.44
@@ -611,9 +611,11 @@
CVSMODULE="$playpen_name"
export CVSMODULE
+
# 9.d. Bootstrap the project
echo "#### Running autogen.sh" >> $LOGFILE
cd $PLAYPEN_DIR || { die ; }
+echo 'developer' > etc/role
./autogen.sh >> $LOGFILE 2>&1 || { die ; }
#=====================================================================
|
|
From: fess <fe...@us...> - 2003-05-26 01:32:58
|
Update of /cvsroot/wigwam/wigwam-test
In directory sc8-pr-cvs1:/tmp/cvs-serv32320
Modified Files:
run-test
Log Message:
add support for runing the tests elsewher
Index: run-test
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/run-test,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- run-test 28 Dec 2001 00:12:41 -0000 1.42
+++ run-test 26 May 2003 01:32:55 -0000 1.43
@@ -23,6 +23,8 @@
tarball.
--no-cleanup Don't remove directories etc, even on an successful test.
--no-sgmltools Don't require sgml-tools.
+ --ww-tests-dir=D run all tests in D, usefull if wigwam-test
+ is in an nfs mounted directory
"
# PURPOSE:
@@ -94,6 +96,7 @@
wpamu="wigwam-packaging-utils"
WWTEST_DIR=`pwd`
+tests_dir="$WWTEST_DIR"
# parse run-test's arguments.
while true ; do
@@ -176,6 +179,17 @@
fi
wpamu_tarball="$1"
;;
+ --ww-tests-dir=*)
+ tests_dir=`echo "x$1" | sed -e 's/x--ww-test-dir=//;'`
+ ;;
+ --ww-tests-dir)
+ shift;
+ if test "x$1" = x ; then
+ echo "$usage" 1>&2
+ exit 1
+ fi
+ tests_dir="$1"
+ ;;
--standard)
if test -d "../wigwam-base" &&
test -d "../$wpamu" ; then
@@ -359,9 +373,9 @@
#=====================================================================
# 1. Make a temporary working directory.
#=====================================================================
-cd $WWTEST_DIR
+cd $tests_dir
test -d test-dir || mkdir test-dir || {
- echo "$id: error making test-dir in $WWTEST_DIR" 1>&2
+ echo "$id: error making test-dir in $tests_dir" 1>&2
{ die ; }
}
mkdir test-dir/$$ > /dev/null 2>&1 || {
@@ -375,7 +389,7 @@
{ die ; }
}
-WORKDIR="$WWTEST_DIR/test-dir/$$"
+WORKDIR="$tests_dir/test-dir/$$"
if test "$quiet" = "0" ; then
echo \
"$id:
|
|
From: fess <fe...@us...> - 2003-05-25 06:27:40
|
Update of /cvsroot/wigwam/wigwam-test In directory sc8-pr-cvs1:/tmp/cvs-serv25941 Modified Files: TODO Log Message: more todo Index: TODO =================================================================== RCS file: /cvsroot/wigwam/wigwam-test/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TODO 16 Sep 2001 22:16:31 -0000 1.9 +++ TODO 25 May 2003 06:27:37 -0000 1.10 @@ -9,3 +9,7 @@ - guess-patch-flags should have some test code.. - configure_style=perl should be tested - need test code for publishing to multiple hosts +- need test code for in project package archives + introduced in wigwam v3.0.48 +- need test code for package-overrides + introduced in wigwam v3.0.48 |
|
From: fess <fe...@us...> - 2001-12-28 06:51:40
|
Update of /cvsroot/wigwam/wigwam-test/tests
In directory usw-pr-cvs1:/tmp/cvs-serv26669/tests
Modified Files:
test-servicectl-basics-1
Log Message:
make sure hupcount and hellod are not running before starting them
and testing them.
Index: test-servicectl-basics-1
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/tests/test-servicectl-basics-1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- test-servicectl-basics-1 2001/09/16 22:16:31 1.7
+++ test-servicectl-basics-1 2001/12/28 06:51:37 1.8
@@ -30,12 +30,17 @@
test_hellod_dead () {
text=`nc localhost $hellod_port`
- test $? = 0 && {
+ test $? = 0 && false || true
+}
+
+servicectl_test_hellod_dead () {
+ test_hellod_daed || {
echo "$0: servicectl stop hellod failed (got \`$text')" 1>&2
exit 1
}
}
+
test_hupcountd_alive () {
text=`nc localhost $hupcountd_port`
test $? = 0 || {
@@ -56,11 +61,16 @@
test_hupcountd_dead () {
text=`nc localhost $hupcountd_port`
- test $? = 0 && {
+ test $? = 0 && false || true
+}
+
+servicectl_test_hupcountd_dead () {
+ test_hupcountd_dead ||{
echo "$0: servicectl stop hupcountd failed (got \`$text')" 1>&2
exit 1
}
}
+
# configure the role.
servicectl check-config role && exit 1
servicectl check-config role 2>&1 | $fgrep -q HELLOD_PORT || exit 1
@@ -70,23 +80,31 @@
servicectl check-config role || exit 1
# basic tests (with hellod)
+test_hellod_dead || {
+ echo "hellod seems to be running from a previous test. kill it."
+ exit 1
+}
servicectl start hellod || exit 1
$HACKTASTIC
test_hellod_alive
servicectl stop hellod || exit 1
-test_hellod_dead
+servictl_test_hellod_dead
servicectl start hellod || exit 1
$HACKTASTIC
test_hellod_alive
servicectl stop hellod || exit 1
-test_hellod_dead
+servictl_test_hellod_dead
# basic tests (with hupcountd)
+test_hupcountd_dead || {
+ echo "hupcountd seems to be running from a previous test. kill it."
+ exit 1
+}
servicectl start hupcountd || exit 1
$HACKTASTIC
test_hupcountd_alive 0
servicectl stop hupcountd || exit 1
-test_hupcountd_dead
+servicectl_test_hupcountd_dead
servicectl start hupcountd || exit 1
$HACKTASTIC
test_hupcountd_alive 0
@@ -98,6 +116,6 @@
test_hupcountd_alive 2
servicectl stop hupcountd || exit 1
$HACKTASTIC
-test_hupcountd_dead
+servicectl_test_hupcountd_dead
exit 0
|
|
From: fess <fe...@us...> - 2001-12-28 00:12:45
|
Update of /cvsroot/wigwam/wigwam-test
In directory usw-pr-cvs1:/tmp/cvs-serv1060
Modified Files:
run-test
Log Message:
use -n for faster results?
Index: run-test
===================================================================
RCS file: /cvsroot/wigwam/wigwam-test/run-test,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- run-test 2001/09/16 22:16:31 1.41
+++ run-test 2001/12/28 00:12:41 1.42
@@ -337,7 +337,7 @@
needed_port_in_use=0
for port in "$MASTER_HELLOD_PORT" "$MASTER_HUPCOUNTD_PORT" ; do
- "$netstat_path" -a | $fgrep LISTEN | $egrep '^tcp' | $egrep -q $port && {
+ "$netstat_path" -an | $fgrep LISTEN | $egrep '^tcp' | $egrep -q $port && {
echo "$id: ***ERROR*** Port $port is in use. I cannot deal with this. (try --kill)" 1>&2
needed_port_in_use=1
exit 1
|