ctdb-tests: Update integration tests to use ctdb -X

[vlendec/samba-autobuild/.git] / ctdb / tests / complex / 34_nfs_tickle_restart.sh

diff --git a/ctdb/tests/complex/34_nfs_tickle_restart.sh b/ctdb/tests/complex/34_nfs_tickle_restart.sh
index 93587e2f316750c8ed252f60c3d3df3d682122e6..365a0176fc96f7dbbff123479c24965a5e8c3ce9 100755 (executable)
--- a/ctdb/tests/complex/34_nfs_tickle_restart.sh
+++ b/ctdb/tests/complex/34_nfs_tickle_restart.sh
@@ -45,7 +45,7 @@ monitor_interval="${out#*= }"
 #echo "Monitor interval on node $test_node is $monitor_interval seconds."
 
 select_test_node_and_ips
-try_command_on_node $test_node "$CTDB listnodes -Y"
+try_command_on_node $test_node "$CTDB listnodes -X"
 listnodes_output="$out"
 numnodes=$(wc -l <<<"$listnodes_output")
 
@@ -67,7 +67,7 @@ echo "Wait until NFS connection is tracked by CTDB on test node ..."
 wait_until 10 check_tickles $test_node $test_ip $test_port $src_socket
 
 echo "Select a node to restart ctdbd"
-rn=$(awk -F: -v test_node=$test_node \
+rn=$(awk -F'|' -v test_node=$test_node \
     '$2 != test_node { print $2 ; exit }' <<<"$listnodes_output")
 
 echo "Restarting CTDB on node ${rn}"
@@ -79,7 +79,7 @@ try_command_on_node $rn $CTDB_TEST_WRAPPER restart_ctdb_1
 echo "Setting NoIPTakeover on node ${rn}"
 try_command_on_node $rn $CTDB setvar NoIPTakeover 1
 
-wait_until_healthy
+wait_until_ready
 
 echo "Getting TickleUpdateInterval..."
 try_command_on_node $test_node $CTDB getvar TickleUpdateInterval