summaryrefslogtreecommitdiff
path: root/ctdb/tests/simple
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/tests/simple')
-rwxr-xr-xctdb/tests/simple/32_ctdb_enable.sh4
-rwxr-xr-xctdb/tests/simple/42_ctdb_continue.sh2
2 files changed, 2 insertions, 4 deletions
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