ctdb-tests: Drop ctdb_restart_when_done()

This no longer does anything.  Integration test cases now start and
shut down the cluster.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh
index d6a3b3c04ff9617cc9859389defb1065caf00905..c1a3e2ae4aa9903540879f0a17ee510423f70ac7 100755 (executable)
--- a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh
+++ b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh
@@ -19,9 +19,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 get_test_ip_mask_and_iface
 

diff --git a/ctdb/tests/complex/18_ctdb_reloadips.sh b/ctdb/tests/complex/18_ctdb_reloadips.sh
index e0632f3056460dd54185c988fe6f8b5fa18ecb96..eff454c8c736701569f992eb7d438ca1e4f57095 100755 (executable)
--- a/ctdb/tests/complex/18_ctdb_reloadips.sh
+++ b/ctdb/tests/complex/18_ctdb_reloadips.sh
@@ -33,9 +33,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 ####################

diff --git a/ctdb/tests/complex/30_nfs_tickle_killtcp.sh b/ctdb/tests/complex/30_nfs_tickle_killtcp.sh
index 40ec6babf2ed9d6a15a78b733564617ac69f7964..19826795ea6011701103fae530774003c9734587 100755 (executable)
--- a/ctdb/tests/complex/30_nfs_tickle_killtcp.sh
+++ b/ctdb/tests/complex/30_nfs_tickle_killtcp.sh
@@ -37,9 +37,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 test_port=2049

diff --git a/ctdb/tests/complex/31_nfs_tickle.sh b/ctdb/tests/complex/31_nfs_tickle.sh
index 0b6990f8df9adf3c075a10bf4a8aefecd9801ebd..c1a8d98df8f9f7ba36150211ecbe942ac703a68a 100755 (executable)
--- a/ctdb/tests/complex/31_nfs_tickle.sh
+++ b/ctdb/tests/complex/31_nfs_tickle.sh
@@ -38,9 +38,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 # We need this for later, so we know how long to run nc for.
 try_command_on_node any $CTDB getvar MonitorInterval
 monitor_interval="${out#*= }"

diff --git a/ctdb/tests/complex/32_cifs_tickle.sh b/ctdb/tests/complex/32_cifs_tickle.sh
index 7f67a1127683e6e51422e09535219f51cb0a3f63..6bb1d917dc55bfd2e8ad4380c7d2241ecb417f7c 100755 (executable)
--- a/ctdb/tests/complex/32_cifs_tickle.sh
+++ b/ctdb/tests/complex/32_cifs_tickle.sh
@@ -38,9 +38,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 # We need this for later, so we know how long to sleep.
 try_command_on_node 0 $CTDB getvar MonitorInterval
 monitor_interval="${out#*= }"

diff --git a/ctdb/tests/complex/33_gratuitous_arp.sh b/ctdb/tests/complex/33_gratuitous_arp.sh
index b2a52931f1f96a3d62c010b633860defb38c625b..0b866cd8ea73223ddcb2f015637ac15d772ed28f 100755 (executable)
--- a/ctdb/tests/complex/33_gratuitous_arp.sh
+++ b/ctdb/tests/complex/33_gratuitous_arp.sh
@@ -48,9 +48,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Removing ${test_ip} from the local ARP table..."

diff --git a/ctdb/tests/complex/34_nfs_tickle_restart.sh b/ctdb/tests/complex/34_nfs_tickle_restart.sh
index 2aab0614ff9b0605507b4dd8357c056de33ad85d..ca3196ec594a35881dfd165828bba3eecbf0c10e 100755 (executable)
--- a/ctdb/tests/complex/34_nfs_tickle_restart.sh
+++ b/ctdb/tests/complex/34_nfs_tickle_restart.sh
@@ -36,9 +36,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 # We need this for later, so we know how long to run nc for.
 try_command_on_node any $CTDB getvar MonitorInterval
 monitor_interval="${out#*= }"

diff --git a/ctdb/tests/complex/36_smb_reset_server.sh b/ctdb/tests/complex/36_smb_reset_server.sh
index beff1a220144283dc51946ae261b976f51827212..aac7511340dd45d7d6db7b33d10dc70cdbd451cb 100755 (executable)
--- a/ctdb/tests/complex/36_smb_reset_server.sh
+++ b/ctdb/tests/complex/36_smb_reset_server.sh
@@ -33,9 +33,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 # We need this for later, so we know how long to sleep.
 try_command_on_node 0 $CTDB getvar MonitorInterval
 monitor_interval="${out#*= }"

diff --git a/ctdb/tests/complex/37_nfs_reset_server.sh b/ctdb/tests/complex/37_nfs_reset_server.sh
index 07bd034d6c7a75be868a6bc5a129f9eb33864d08..eae9e537f3d3e36c1e452c70b06b363e968225bb 100755 (executable)
--- a/ctdb/tests/complex/37_nfs_reset_server.sh
+++ b/ctdb/tests/complex/37_nfs_reset_server.sh
@@ -33,9 +33,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 # We need this for later, so we know how long to sleep.
 try_command_on_node 0 $CTDB getvar MonitorInterval
 monitor_interval="${out#*= }"

diff --git a/ctdb/tests/complex/41_failover_ping_discrete.sh b/ctdb/tests/complex/41_failover_ping_discrete.sh
index 22780c40251270db0b5b7f44ae5ba73d3e0bfb58..ad8b15b0ad99c5b62f4d437f8dc0b7c0107f763e 100755 (executable)
--- a/ctdb/tests/complex/41_failover_ping_discrete.sh
+++ b/ctdb/tests/complex/41_failover_ping_discrete.sh
@@ -42,9 +42,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Removing ${test_ip} from the local neighbor table..."

diff --git a/ctdb/tests/complex/42_failover_ssh_hostname.sh b/ctdb/tests/complex/42_failover_ssh_hostname.sh
index 14c2f472708f6b6d458dc2bcb73efa22c80bd293..2120ff8ccbfc7741c263894aed96e383fb921c8d 100755 (executable)
--- a/ctdb/tests/complex/42_failover_ssh_hostname.sh
+++ b/ctdb/tests/complex/42_failover_ssh_hostname.sh
@@ -42,9 +42,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Removing ${test_ip} from the local neighbor table..."

diff --git a/ctdb/tests/complex/43_failover_nfs_basic.sh b/ctdb/tests/complex/43_failover_nfs_basic.sh
index 9ccf6d7d0d0742c46ab3657579f8be50092b471d..eb799ba05c4303fdc8fd41db8ae9ad8c6da3adcd 100755 (executable)
--- a/ctdb/tests/complex/43_failover_nfs_basic.sh
+++ b/ctdb/tests/complex/43_failover_nfs_basic.sh
@@ -46,9 +46,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 nfs_test_setup
 
 echo "Create file containing random data..."

diff --git a/ctdb/tests/complex/44_failover_nfs_oneway.sh b/ctdb/tests/complex/44_failover_nfs_oneway.sh
index 1bc09f55f49ac8c5c0544d31d98e0f5c8cfca22f..ee65e0717d904bdfc214499fe9ff27397cefbefb 100755 (executable)
--- a/ctdb/tests/complex/44_failover_nfs_oneway.sh
+++ b/ctdb/tests/complex/44_failover_nfs_oneway.sh
@@ -48,9 +48,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 nfs_test_setup
 
 echo "Create file containing random data..."

diff --git a/ctdb/tests/complex/45_failover_nfs_kill.sh b/ctdb/tests/complex/45_failover_nfs_kill.sh
index 75a0345b33c9d20dc9d58438f728f61dd04bc5c3..108e243f818f05f2c2aed252fb72bd392a201e30 100755 (executable)
--- a/ctdb/tests/complex/45_failover_nfs_kill.sh
+++ b/ctdb/tests/complex/45_failover_nfs_kill.sh
@@ -46,9 +46,6 @@ ctdb_test_check_real_cluster
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 nfs_test_setup
 
 echo "Create file containing random data..."

diff --git a/ctdb/tests/complex/60_rogueip_releaseip.sh b/ctdb/tests/complex/60_rogueip_releaseip.sh
index 0daf289c83ab3569526f33c725a3a885d89d6cf0..ec4ddf90ab70fc61540785f2117da7fc73710177 100755 (executable)
--- a/ctdb/tests/complex/60_rogueip_releaseip.sh
+++ b/ctdb/tests/complex/60_rogueip_releaseip.sh
@@ -17,9 +17,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Using $test_ip, which is onnode $test_node"

diff --git a/ctdb/tests/complex/61_rogueip_takeip.sh b/ctdb/tests/complex/61_rogueip_takeip.sh
index 1c087f6391d03fff0c8a9895895c35a65eb41648..2f95afd33442c9bda5b01d04bd7bf9771caf1b4e 100755 (executable)
--- a/ctdb/tests/complex/61_rogueip_takeip.sh
+++ b/ctdb/tests/complex/61_rogueip_takeip.sh
@@ -17,9 +17,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Running test against node $test_node and IP $test_ip"

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index f53dd76c909f4452d009adc7bebe17d1565689d0..3434db91b6eeeaa80f15bb9900d35eb28f060127 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -57,8 +57,6 @@ ctdb_test_exit_hook_add ()
 
 ctdb_test_init ()
 {
-       ctdb_test_restart_scheduled=false
-
        trap "ctdb_test_exit" 0
 
        ctdb_stop_all >/dev/null 2>&1 || true
@@ -584,11 +582,6 @@ ctdb_init ()
     return 1
 }
 
-ctdb_restart_when_done ()
-{
-    ctdb_test_restart_scheduled=true
-}
-
 ctdb_base_show ()
 {
        echo "${CTDB_BASE:-${CTDB_SCRIPTS_BASE}}"

diff --git a/ctdb/tests/simple/02_ctdb_tunables.sh b/ctdb/tests/simple/02_ctdb_tunables.sh
index e6caf3d625a37dc73811d998216a242cfad775a7..667e715546e9d4d9ec8d9955be9d5706a142d730 100755 (executable)
--- a/ctdb/tests/simple/02_ctdb_tunables.sh
+++ b/ctdb/tests/simple/02_ctdb_tunables.sh
@@ -15,8 +15,6 @@ set -e
 
 cluster_is_healthy
 
-ctdb_restart_when_done
-
 try_command_on_node -v 0 "$CTDB listvars"
 
 sanity_check_output \

diff --git a/ctdb/tests/simple/09_ctdb_ping.sh b/ctdb/tests/simple/09_ctdb_ping.sh
index ab6ba146df6f483e3e75bb28b5bff37386f7cb43..78c6fb06b214e56bd3b6489131ab063274106c50 100755 (executable)
--- a/ctdb/tests/simple/09_ctdb_ping.sh
+++ b/ctdb/tests/simple/09_ctdb_ping.sh
@@ -35,9 +35,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 try_command_on_node -v 0 "$CTDB ping -n 1"
 
 sanity_check_output \

diff --git a/ctdb/tests/simple/13_ctdb_setdebug.sh b/ctdb/tests/simple/13_ctdb_setdebug.sh
index 2301ef6833e99aa0f695b96e81f173be9c9d94da..e64fca87e3d52eb4583c1ed04c0e013a39528122 100755 (executable)
--- a/ctdb/tests/simple/13_ctdb_setdebug.sh
+++ b/ctdb/tests/simple/13_ctdb_setdebug.sh
@@ -19,8 +19,6 @@ set -e
 
 cluster_is_healthy
 
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 get_debug ()

diff --git a/ctdb/tests/simple/16_ctdb_config_add_ip.sh b/ctdb/tests/simple/16_ctdb_config_add_ip.sh
index 0bc668a906e328395aa81968976e1fda5c47c0ba..7d7ad0c81db04bd97a252e4a9332fb9fbba8b879 100755 (executable)
--- a/ctdb/tests/simple/16_ctdb_config_add_ip.sh
+++ b/ctdb/tests/simple/16_ctdb_config_add_ip.sh
@@ -18,9 +18,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 get_test_ip_mask_and_iface
 

diff --git a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh b/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
index cac22153213a394afdcb7bc54b2e76a1e546fae6..d69f765d13da9bba42d3117e6cf3776cccea252a 100755 (executable)
--- a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
+++ b/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
@@ -18,9 +18,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Deleting IP ${test_ip} from node ${test_node}"

diff --git a/ctdb/tests/simple/18_ctdb_reloadips.sh b/ctdb/tests/simple/18_ctdb_reloadips.sh
index 95b819fd82b1c7a06f1cc3598bba6e0c33094980..809caea7eb2c4a23d85818de11a677d7acd9fa80 100755 (executable)
--- a/ctdb/tests/simple/18_ctdb_reloadips.sh
+++ b/ctdb/tests/simple/18_ctdb_reloadips.sh
@@ -27,9 +27,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Emptying public addresses file on $test_node"

diff --git a/ctdb/tests/simple/19_ip_takeover_noop.sh b/ctdb/tests/simple/19_ip_takeover_noop.sh
index 670e33e3408c6e8bec4c13428331be4c238cdd80..f46a2448dd93fa100fdf264d0d63ac1efc2bcae1 100755 (executable)
--- a/ctdb/tests/simple/19_ip_takeover_noop.sh
+++ b/ctdb/tests/simple/19_ip_takeover_noop.sh
@@ -26,9 +26,6 @@ if [ -z "$TEST_LOCAL_DAEMONS" ] ; then
        exit 0
 fi
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 ctdb_stop_all

diff --git a/ctdb/tests/simple/20_delip_iface_gc.sh b/ctdb/tests/simple/20_delip_iface_gc.sh
index e73eed20cc00f1d3a576f60bd76dd4056e46c27c..43ab697fdc7ef80a5d5c6bebdca8b8aa945530a2 100755 (executable)
--- a/ctdb/tests/simple/20_delip_iface_gc.sh
+++ b/ctdb/tests/simple/20_delip_iface_gc.sh
@@ -15,9 +15,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 # Find interfaces on test node

diff --git a/ctdb/tests/simple/21_ctdb_attach.sh b/ctdb/tests/simple/21_ctdb_attach.sh
index 11b600800a4bb0caff0bf8b57f5408f5d0d82c31..5af7c7c0e4c820f06eb5044b655eb95d85d164e3 100755 (executable)
--- a/ctdb/tests/simple/21_ctdb_attach.sh
+++ b/ctdb/tests/simple/21_ctdb_attach.sh
@@ -34,9 +34,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 ######################################################################
 
 try_command_on_node 0 "$CTDB listnodes -X"

diff --git a/ctdb/tests/simple/23_ctdb_moveip.sh b/ctdb/tests/simple/23_ctdb_moveip.sh
index c6e70bf4e94585f965fd33e9a47e9dddd8be4db0..073c93ccd977dd8b454c6dcb04650c958c67d6d8 100755 (executable)
--- a/ctdb/tests/simple/23_ctdb_moveip.sh
+++ b/ctdb/tests/simple/23_ctdb_moveip.sh
@@ -21,9 +21,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 sanity_check_ips "$out"

diff --git a/ctdb/tests/simple/24_ctdb_getdbmap.sh b/ctdb/tests/simple/24_ctdb_getdbmap.sh
index 9bed5903914165aacd70b1b724d409b57db58c2f..e08075132ae1e1aa0206018d89a24b059646ef8c 100755 (executable)
--- a/ctdb/tests/simple/24_ctdb_getdbmap.sh
+++ b/ctdb/tests/simple/24_ctdb_getdbmap.sh
@@ -31,9 +31,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 make_temp_db_filename ()
 {
     dd if=/dev/urandom count=1 bs=512 2>/dev/null |

diff --git a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh b/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
index 6642b1759f96532d86a7ae401b7e1ca676c89af0..1652b8a3e5fc426cf493b57be8b235a2df49824f 100755 (executable)
--- a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
+++ b/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
@@ -40,9 +40,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 test_node=1
 
 try_command_on_node 0 "$CTDB listnodes"

diff --git a/ctdb/tests/simple/27_ctdb_detach.sh b/ctdb/tests/simple/27_ctdb_detach.sh
index 42ec635fb65c0fe622d27150345b6fcbec76a28c..c287a9918018b6c40b881e46016dc6557c814c15 100755 (executable)
--- a/ctdb/tests/simple/27_ctdb_detach.sh
+++ b/ctdb/tests/simple/27_ctdb_detach.sh
@@ -30,9 +30,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 ######################################################################
 
 try_command_on_node 0 "$CTDB listnodes -X"

diff --git a/ctdb/tests/simple/28_zero_eventscripts.sh b/ctdb/tests/simple/28_zero_eventscripts.sh
index ee976cba1078c87a3ba87bd083da93067ed3e6f9..7ddaaa007cc672c4b631c1155669bed776143707 100755 (executable)
--- a/ctdb/tests/simple/28_zero_eventscripts.sh
+++ b/ctdb/tests/simple/28_zero_eventscripts.sh
@@ -23,9 +23,6 @@ if [ -z "$TEST_LOCAL_DAEMONS" ] ; then
        exit 0
 fi
 
-# Reset configuration
-ctdb_restart_when_done
-
 ctdb_stop_all
 
 echo "Starting CTDB with an empty eventscript directory..."

diff --git a/ctdb/tests/simple/42_ctdb_stop_continue.sh b/ctdb/tests/simple/42_ctdb_stop_continue.sh
index 04349e2d1538ee711f57c79098ab2aa91fb10446..44e60931bb9c90d641b13d50544403a8d9652431 100755 (executable)
--- a/ctdb/tests/simple/42_ctdb_stop_continue.sh
+++ b/ctdb/tests/simple/42_ctdb_stop_continue.sh
@@ -15,9 +15,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Stopping node ${test_node}..."

diff --git a/ctdb/tests/simple/43_stop_recmaster_yield.sh b/ctdb/tests/simple/43_stop_recmaster_yield.sh
index e7a825002e56dc93fd4927df4e231421d68ca8df..24221f61a61bd20c8a5283c41bfa3afaedd1a992 100755 (executable)
--- a/ctdb/tests/simple/43_stop_recmaster_yield.sh
+++ b/ctdb/tests/simple/43_stop_recmaster_yield.sh
@@ -30,9 +30,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 echo "Finding out which node is the recovery master..."
 try_command_on_node -v 0 "$CTDB recmaster"
 test_node=$out

diff --git a/ctdb/tests/simple/54_transaction_loop_recovery.sh b/ctdb/tests/simple/54_transaction_loop_recovery.sh
index a5d94ffbf894de59c7e6ec04f37a51dfb6840bc3..d4fa2fda802b53cf96a14e19969c527cdd5d10fa 100755 (executable)
--- a/ctdb/tests/simple/54_transaction_loop_recovery.sh
+++ b/ctdb/tests/simple/54_transaction_loop_recovery.sh
@@ -38,8 +38,6 @@ set -e
 
 cluster_is_healthy
 
-ctdb_restart_when_done
-
 TESTDB="persistent_trans.tdb"
 
 try_command_on_node 0 "$CTDB attach $TESTDB persistent"

diff --git a/ctdb/tests/simple/56_replicated_transaction_recovery.sh b/ctdb/tests/simple/56_replicated_transaction_recovery.sh
index 61827145bc2164af0472f5b4ccf8c9b5a0cc7643..cc9ace0a8dd3bbb6aa5b842502f6261160ae055c 100755 (executable)
--- a/ctdb/tests/simple/56_replicated_transaction_recovery.sh
+++ b/ctdb/tests/simple/56_replicated_transaction_recovery.sh
@@ -39,8 +39,6 @@ set -e
 
 cluster_is_healthy
 
-ctdb_restart_when_done
-
 TESTDB="replicated_trans.tdb"
 
 try_command_on_node 0 "$CTDB attach $TESTDB replicated"

diff --git a/ctdb/tests/simple/60_recoverd_missing_ip.sh b/ctdb/tests/simple/60_recoverd_missing_ip.sh
index 215d0942a80cb25d07a2eae2fac24c08fd928055..86bd6162d58190ac580fe7cf11c85b06af588a70 100755 (executable)
--- a/ctdb/tests/simple/60_recoverd_missing_ip.sh
+++ b/ctdb/tests/simple/60_recoverd_missing_ip.sh
@@ -20,9 +20,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 select_test_node_and_ips
 
 echo "Running test against node $test_node and IP $test_ip"

diff --git a/ctdb/tests/simple/69_recovery_resurrect_deleted.sh b/ctdb/tests/simple/69_recovery_resurrect_deleted.sh
index 95e79fdd49196593713053cfc89eb51822ce6ab4..80511cadc3c36772090d7503923d917534350a00 100755 (executable)
--- a/ctdb/tests/simple/69_recovery_resurrect_deleted.sh
+++ b/ctdb/tests/simple/69_recovery_resurrect_deleted.sh
@@ -15,9 +15,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 testdb="rec_test.tdb"
 
 echo "Getting list of nodes..."

diff --git a/ctdb/tests/simple/70_recoverpdbbyseqnum.sh b/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
index 255d58d2156e57d9c2bf1fa15fdb05ba9a4b50c6..52117eff25032124979a0f2af934facdb7a2cd9e 100755 (executable)
--- a/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
+++ b/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
@@ -35,9 +35,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 try_command_on_node 0 "$CTDB listnodes"
 num_nodes=$(echo "$out" | wc -l)
 

diff --git a/ctdb/tests/simple/73_tunable_NoIPTakeover.sh b/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
index 62a307709be008c8642fae6e78e6f32cf2b78df5..01dbb5db8ee71d44dbb70fd7eba1b31d0ac505de 100755 (executable)
--- a/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
+++ b/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
@@ -30,9 +30,6 @@ ctdb_test_init "$@"
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 try_command_on_node 0 "$CTDB listnodes | wc -l"
 num_nodes="$out"
 echo "There are $num_nodes nodes..."

diff --git a/ctdb/tests/simple/75_readonly_records_basic.sh b/ctdb/tests/simple/75_readonly_records_basic.sh
index 48e16dfed8c9c82683504b096e589a4663263d80..dbeeb0ad1574b3bdf4b6d665e390866f4d810629 100755 (executable)
--- a/ctdb/tests/simple/75_readonly_records_basic.sh
+++ b/ctdb/tests/simple/75_readonly_records_basic.sh
@@ -42,9 +42,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 ######################################################################
 
 # Confirm that no nodes have databases with read-only delegations

diff --git a/ctdb/tests/simple/76_ctdb_pdb_recovery.sh b/ctdb/tests/simple/76_ctdb_pdb_recovery.sh
index a961405a74f8cbc41bd9697343e6368227d64f93..6def50accfe6b5e915bbdd4bd54ced4a346a8a8c 100755 (executable)
--- a/ctdb/tests/simple/76_ctdb_pdb_recovery.sh
+++ b/ctdb/tests/simple/76_ctdb_pdb_recovery.sh
@@ -29,9 +29,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 do_test()
 {
 # Wipe Test database

diff --git a/ctdb/tests/simple/77_ctdb_db_recovery.sh b/ctdb/tests/simple/77_ctdb_db_recovery.sh
index 6dbc0cf639cf8b274622706ea70f3944eb2d5d74..67c4f64a7f3665f3bbb8e3bf4ec6c88e03ff27d7 100755 (executable)
--- a/ctdb/tests/simple/77_ctdb_db_recovery.sh
+++ b/ctdb/tests/simple/77_ctdb_db_recovery.sh
@@ -41,9 +41,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 #
 # Main test
 #

diff --git a/ctdb/tests/simple/78_ctdb_large_db_recovery.sh b/ctdb/tests/simple/78_ctdb_large_db_recovery.sh
index ae2434b25e6746c43d18654946e984e164a0c3a6..a2032a9a8ea28a075459266af5e26e7b99109f07 100755 (executable)
--- a/ctdb/tests/simple/78_ctdb_large_db_recovery.sh
+++ b/ctdb/tests/simple/78_ctdb_large_db_recovery.sh
@@ -29,9 +29,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 #
 # Main test
 #

diff --git a/ctdb/tests/simple/79_volatile_db_traverse.sh b/ctdb/tests/simple/79_volatile_db_traverse.sh
index 50732cab330d5eedacfb2d333ad2d52bbc435d68..737d87aba9029034300f1c4cafd62b27cfbb90f1 100755 (executable)
--- a/ctdb/tests/simple/79_volatile_db_traverse.sh
+++ b/ctdb/tests/simple/79_volatile_db_traverse.sh
@@ -25,9 +25,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 #
 # Main test
 #

diff --git a/ctdb/tests/simple/80_ctdb_traverse.sh b/ctdb/tests/simple/80_ctdb_traverse.sh
index 334c684d17cba1c08b0d73554b1c963a5c302056..e19af4b74c02ad846e76182795ffcc6d0ef52723 100755 (executable)
--- a/ctdb/tests/simple/80_ctdb_traverse.sh
+++ b/ctdb/tests/simple/80_ctdb_traverse.sh
@@ -30,9 +30,6 @@ set -e
 
 cluster_is_healthy
 
-# Reset configuration
-ctdb_restart_when_done
-
 try_command_on_node 0 "$CTDB listnodes"
 num_nodes=$(echo "$out" | wc -l)
 

diff --git a/ctdb/tests/simple/90_debug_hung_script.sh b/ctdb/tests/simple/90_debug_hung_script.sh
index 846188fc7160bef63e8b2749be4f80c0b5edce94..029ad51b3fb6e1e464ad5fce7b06f2a4a0484aa1 100755 (executable)
--- a/ctdb/tests/simple/90_debug_hung_script.sh
+++ b/ctdb/tests/simple/90_debug_hung_script.sh
@@ -28,9 +28,6 @@ if [ -z "$TEST_LOCAL_DAEMONS" ] ; then
        exit 0
 fi
 
-# Reset configuration
-ctdb_restart_when_done
-
 # This is overkill but it at least provides a valid test node
 select_test_node_and_ips