Test suite: Update "complex" tests for wait_until_node_has_status() change.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/tests/complex/31_nfs_tickle.sh b/tests/complex/31_nfs_tickle.sh
index 219fc0e5ed8dc3fe22602186b093b2ce28d2de70..b2c3964fed53a05f5a4547e8930d9688ebee586a 100755 (executable)
--- a/tests/complex/31_nfs_tickle.sh
+++ b/tests/complex/31_nfs_tickle.sh
@@ -96,6 +96,6 @@ tcptickle_sniff_start $src_socket "${test_ip}:${test_port}"
 
 echo "Disabling node $test_node"
 try_command_on_node 1 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 tcptickle_sniff_wait_show

diff --git a/tests/complex/32_cifs_tickle.sh b/tests/complex/32_cifs_tickle.sh
index 4ce74f9ad1f8d434f5a8765f69389b8f9733cbf7..2280e815100757533f009171ee33d56113920879 100755 (executable)
--- a/tests/complex/32_cifs_tickle.sh
+++ b/tests/complex/32_cifs_tickle.sh
@@ -87,6 +87,6 @@ tcptickle_sniff_start $src_socket "${test_ip}:${test_port}"
 
 echo "Disabling node $test_node"
 try_command_on_node 1 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 tcptickle_sniff_wait_show

diff --git a/tests/complex/33_gratuitous_arp.sh b/tests/complex/33_gratuitous_arp.sh
index e94a914644b4cfff28d32e8fc29da90cbb1dc148..8a3de03bede962a8e30470871ade23aa191c569c 100755 (executable)
--- a/tests/complex/33_gratuitous_arp.sh
+++ b/tests/complex/33_gratuitous_arp.sh
@@ -69,7 +69,7 @@ gratarp_sniff_start
 
 echo "Disabling node $test_node"
 try_command_on_node 1 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 gratarp_sniff_wait_show
 

diff --git a/tests/complex/41_failover_ping_discrete.sh b/tests/complex/41_failover_ping_discrete.sh
index 32841c5339de17a020472dd6038ecf559df6c80e..73bc84e30d00157d04ac0c0a5c42aa17d70b16a4 100755 (executable)
--- a/tests/complex/41_failover_ping_discrete.sh
+++ b/tests/complex/41_failover_ping_discrete.sh
@@ -57,7 +57,7 @@ gratarp_sniff_start
 
 echo "Disabling node $test_node"
 try_command_on_node 1 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 gratarp_sniff_wait_show
 

diff --git a/tests/complex/42_failover_ssh_hostname.sh b/tests/complex/42_failover_ssh_hostname.sh
index 4b3ed88223722bea28daf7f286c739685b000040..f1a01f799d2d6b41f405ba9b1eb6830d4148fe51 100755 (executable)
--- a/tests/complex/42_failover_ssh_hostname.sh
+++ b/tests/complex/42_failover_ssh_hostname.sh
@@ -60,7 +60,7 @@ gratarp_sniff_start
 
 echo "Disabling node $test_node"
 try_command_on_node 1 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 gratarp_sniff_wait_show
 

diff --git a/tests/complex/43_failover_nfs_basic.sh b/tests/complex/43_failover_nfs_basic.sh
index aa3a65caf8291cdfb90fab9617a8a51ec7c1c06a..883a452190ec15bde3859c396bd91e1435344a11 100755 (executable)
--- a/tests/complex/43_failover_nfs_basic.sh
+++ b/tests/complex/43_failover_nfs_basic.sh
@@ -71,7 +71,7 @@ gratarp_sniff_start
 
 echo "Disabling node $test_node"
 try_command_on_node 0 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 gratarp_sniff_wait_show
 

diff --git a/tests/complex/44_failover_nfs_oneway.sh b/tests/complex/44_failover_nfs_oneway.sh
index 258670bba37162d1317dfb6a9a9591eb72a2fe29..8fa12b99ca2d9bcd1c5b20ec36aaaf08f43c1058 100755 (executable)
--- a/tests/complex/44_failover_nfs_oneway.sh
+++ b/tests/complex/44_failover_nfs_oneway.sh
@@ -90,7 +90,7 @@ gratarp_sniff_start
 
 echo "Disabling node $test_node"
 try_command_on_node 0 $CTDB disable -n $test_node
-onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled
 
 gratarp_sniff_wait_show