From: Martin Schwenke Date: Wed, 30 Sep 2020 00:48:38 +0000 (+1000) Subject: ctdb-tests: Strengthen node state checking in ctdb disable/enable test X-Git-Tag: samba-4.12.10~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a1d5236678eb126d30b07602dd73d99b707aff8;p=thirdparty%2Fsamba.git ctdb-tests: Strengthen node state checking in ctdb disable/enable test Check that the desired state is set on all nodes instead of just the test node. This ensures that node flags have correctly propagated across the cluster. RN: Fix remaining ctdb disable/enable bug BUG: https://bugzilla.samba.org/show_bug.cgi?id=14513 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Tue Oct 6 04:32:06 UTC 2020 on sn-devel-184 (cherry picked from commit b68105b8f7c20692d23d457f2777edcf44f12bb8) Signed-off-by: Martin Schwenke --- diff --git a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh index c0bb62d1991..0b8425b2556 100755 --- a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh +++ b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh @@ -21,10 +21,10 @@ select_test_node_and_ips echo "Disabling node $test_node" try_command_on_node 1 $CTDB disable -n $test_node -wait_until_node_has_status $test_node disabled +wait_until_node_has_status $test_node disabled 30 all wait_until_node_has_no_ips "$test_node" echo "Re-enabling node $test_node" try_command_on_node 1 $CTDB enable -n $test_node -wait_until_node_has_status $test_node enabled +wait_until_node_has_status $test_node enabled 30 all wait_until_node_has_some_ips "$test_node"