From: Martin Schwenke Date: Mon, 8 Oct 2018 00:13:15 +0000 (+1100) Subject: ctdb-tests: Use wait_until_node_has_no_ips() in some tests X-Git-Tag: tdb-1.3.17~894 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fdac517fa8a945eb272a645bf1e7d3f10812153;p=thirdparty%2Fsamba.git ctdb-tests: Use wait_until_node_has_no_ips() in some tests This strengthens those tests to ensure that released IPs aren't replaced with others. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/simple/32_ctdb_enable.sh b/ctdb/tests/simple/32_ctdb_enable.sh index dddf8813313..5933dc84c7a 100755 --- a/ctdb/tests/simple/32_ctdb_enable.sh +++ b/ctdb/tests/simple/32_ctdb_enable.sh @@ -32,9 +32,7 @@ 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 - -echo "Waiting for IPs to no longer be hosted on node ${test_node}" -wait_until_ips_are_on_node '!' $test_node $test_node_ips +wait_until_node_has_no_ips "$test_node" echo "Re-enabling node $test_node" try_command_on_node 1 $CTDB enable -n $test_node diff --git a/ctdb/tests/simple/42_ctdb_continue.sh b/ctdb/tests/simple/42_ctdb_continue.sh index b75759fce4a..510dfec2bd2 100755 --- a/ctdb/tests/simple/42_ctdb_continue.sh +++ b/ctdb/tests/simple/42_ctdb_continue.sh @@ -31,7 +31,7 @@ select_test_node_and_ips echo "Stopping node ${test_node}..." try_command_on_node 1 $CTDB stop -n $test_node wait_until_node_has_status $test_node stopped -wait_until_ips_are_on_node '!' $test_node $test_node_ips +wait_until_node_has_no_ips "$test_node" echo "Continuing node $test_node" try_command_on_node 1 $CTDB continue -n $test_node