The branch, master has been updated via fd3b73d7e634f16cbb99d7d5a548e12f00d1aadb (commit) via 14012781c3751a514055df29ea70adfb12ecb2d9 (commit) via 7640352c6697f9d4e0d13afbc8523afc64e7d462 (commit) via c5e3e4bccbde349739b90d8761e1aa19637887a8 (commit) via d0b539c4d2d4dc8c9eb95801bff09c3bcbeebca5 (commit) via 61df417821762d87ed01a7b5e64c35079940344d (commit) from 03fa2a517247eb2adfba67248e2466f17ea14418 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit fd3b73d7e634f16cbb99d7d5a548e12f00d1aadb Author: Martin Schwenke <mar...@meltin.net> Date: Fri May 25 11:44:56 2012 +1000 tests/eventscripts: Tweak expected output for lockd:b restart Commit 13acd58c41fba1a33894fbd654fed69ea0eac322 mades this test fail, since lockd:b and lockd:bs were incorrectly producing the same output. commit 14012781c3751a514055df29ea70adfb12ecb2d9 Author: Martin Schwenke <mar...@meltin.net> Date: Wed May 23 15:36:01 2012 +1000 tests: Complex tests must not be run from a cluster node Tickle tests fail if run from a node involved in the test. The condition is actually weaker than this: the test can't be run from a CTDB node that is hosting public addresses that may be used by the test. Rework ctdb_test_check_real_cluster() to support checking this. Signed-off-by: Martin Schwenke <mar...@meltin.net> commit 7640352c6697f9d4e0d13afbc8523afc64e7d462 Author: Martin Schwenke <mar...@meltin.net> Date: Wed May 23 14:24:40 2012 +1000 Eventscripts: Fix deprecated iptables ! usage This currently causes warning in the logs. This change is not SLES10-compatible but we already have some other non-SLES10-compatible changes. Signed-off-by: Martin Schwenke <mar...@meltin.net> commit c5e3e4bccbde349739b90d8761e1aa19637887a8 Author: Martin Schwenke <mar...@meltin.net> Date: Tue May 22 11:24:05 2012 +1000 tests: test_wrap needs to set TEST_BIN_DIR when installed Signed-off-by: Martin Schwenke <mar...@meltin.net> commit d0b539c4d2d4dc8c9eb95801bff09c3bcbeebca5 Author: Amitay Isaacs <ami...@gmail.com> Date: Fri May 18 12:59:41 2012 +1000 packaging: make ctdb-tests package depend on nc Signed-off-by: Amitay Isaacs <ami...@gmail.com> commit 61df417821762d87ed01a7b5e64c35079940344d Author: Amitay Isaacs <ami...@gmail.com> Date: Thu May 10 16:59:39 2012 +1000 tests: Use per node log files when running tests with local daemons Signed-off-by: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: config/events.d/11.natgw | 4 ++-- packaging/RPM/ctdb.spec.in | 1 + tests/INSTALL | 2 ++ tests/complex/scripts/local.bash | 11 ++++++----- tests/eventscripts/scripts/local.sh | 2 +- tests/scripts/integration.bash | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw index ba6d7a5..5093752 100755 --- a/config/events.d/11.natgw +++ b/config/events.d/11.natgw @@ -28,7 +28,7 @@ delete_all() { # Delete the masquerading setup from a previous iteration where we # were the NAT-GW - iptables -D POSTROUTING -t nat -s $CTDB_NATGW_PRIVATE_NETWORK -d ! $CTDB_NATGW_PRIVATE_NETWORK -j MASQUERADE >/dev/null 2>/dev/null + iptables -D POSTROUTING -t nat -s $CTDB_NATGW_PRIVATE_NETWORK ! -d $CTDB_NATGW_PRIVATE_NETWORK -j MASQUERADE >/dev/null 2>/dev/null # remove any iptables rule we may have on this address iptables -D INPUT -p tcp --syn -d $_ip/32 -j REJECT 2>/dev/null @@ -71,7 +71,7 @@ case "$1" in if [ "$MYPNN" = "$NATGWMASTER" ]; then # This is the first node, set it up as the NAT GW echo 1 >/proc/sys/net/ipv4/ip_forward - iptables -A POSTROUTING -t nat -s $CTDB_NATGW_PRIVATE_NETWORK -d ! $CTDB_NATGW_PRIVATE_NETWORK -j MASQUERADE + iptables -A POSTROUTING -t nat -s $CTDB_NATGW_PRIVATE_NETWORK ! -d $CTDB_NATGW_PRIVATE_NETWORK -j MASQUERADE # block all incoming connections to the natgw address CTDB_NATGW_PUBLIC_IP_HOST=`echo $CTDB_NATGW_PUBLIC_IP | sed -e "s/\/.*/\/32/"` diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in index 09a30f4..381739c 100644 --- a/packaging/RPM/ctdb.spec.in +++ b/packaging/RPM/ctdb.spec.in @@ -182,6 +182,7 @@ development libraries for ctdb Summary: CTDB test suite Group: Development/Tools Requires: ctdb = %{version} +Requires: nc %description tests test suite for ctdb diff --git a/tests/INSTALL b/tests/INSTALL index c67d76d..8c3f777 100755 --- a/tests/INSTALL +++ b/tests/INSTALL @@ -74,6 +74,8 @@ done for i in "events.d" "functions" ; do ln -sf "${etcdir}/ctdb/${i}" "${ctdb_datadir}/eventscripts/etc-ctdb/${i}" done +# test_wrap needs to set TEST_BIN_DIR +sed -i -e "s@^TEST_SCRIPTS_DIR=.*@&\nexport TEST_BIN_DIR=\"${libdir}/ctdb-tests\"@" "${ctdb_datadir}/scripts/test_wrap" ctdb_libdir="${destdir}${libdir}/ctdb-tests" mkdir -p "${destdir}${libdir}" diff --git a/tests/complex/scripts/local.bash b/tests/complex/scripts/local.bash index e3cd431..0976c3f 100644 --- a/tests/complex/scripts/local.bash +++ b/tests/complex/scripts/local.bash @@ -129,11 +129,12 @@ gratarp_sniff_wait_show () ctdb_test_check_real_cluster () { - if [ -z "$TEST_LOCAL_DAEMONS" ] ; then - return 0 - fi + [ -z "$TEST_LOCAL_DAEMONS" ] || \ + die "ERROR: This test must be run against a real/virtual cluster, not local daemons." - echo "ERROR: This test must be run on a real/virtual cluster, not local daemons." - return 1 + for i in $(onnode -q all hostname) ; do + [ "$h" != "$i" ] || \ + die "ERROR: This test must not be run from a cluster node." + done } diff --git a/tests/eventscripts/scripts/local.sh b/tests/eventscripts/scripts/local.sh index b2deb05..e1ae84c 100644 --- a/tests/eventscripts/scripts/local.sh +++ b/tests/eventscripts/scripts/local.sh @@ -600,7 +600,7 @@ Starting nfs: OK" knfsd:bs) _t="Trying to restart NFS service" ;; - lockd) + lockd|lockd:b) _t="\ Trying to restart lock manager service Stopping nfslock: OK diff --git a/tests/scripts/integration.bash b/tests/scripts/integration.bash index b156ca2..70308de 100644 --- a/tests/scripts/integration.bash +++ b/tests/scripts/integration.bash @@ -558,7 +558,7 @@ daemons_start_1 () fi local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES") - local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemons.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state" + local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state" if [ -z "$CTDB_TEST_REAL_CLUSTER" ]; then ctdb_options="$ctdb_options --public-interface=lo" -- CTDB repository