From: Martin Schwenke Date: Mon, 8 Oct 2018 02:51:01 +0000 (+1100) Subject: ctdb-tests: Drop ctdb_restart_when_done() X-Git-Tag: tdb-1.3.17~881 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d762e52e65a574091f498e1305d3125cdab2c392;p=thirdparty%2Fsamba.git 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 Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh index d6a3b3c04ff..c1a3e2ae4aa 100755 --- 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 e0632f30564..eff454c8c73 100755 --- 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 40ec6babf2e..19826795ea6 100755 --- 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 0b6990f8df9..c1a8d98df8f 100755 --- 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 7f67a112768..6bb1d917dc5 100755 --- 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 b2a52931f1f..0b866cd8ea7 100755 --- 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 2aab0614ff9..ca3196ec594 100755 --- 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 beff1a22014..aac7511340d 100755 --- 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 07bd034d6c7..eae9e537f3d 100755 --- 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 22780c40251..ad8b15b0ad9 100755 --- 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 14c2f472708..2120ff8ccbf 100755 --- 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 9ccf6d7d0d0..eb799ba05c4 100755 --- 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 1bc09f55f49..ee65e0717d9 100755 --- 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 75a0345b33c..108e243f818 100755 --- 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 0daf289c83a..ec4ddf90ab7 100755 --- 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 1c087f6391d..2f95afd3344 100755 --- 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 f53dd76c909..3434db91b6e 100644 --- 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 e6caf3d625a..667e715546e 100755 --- 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 ab6ba146df6..78c6fb06b21 100755 --- 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 2301ef6833e..e64fca87e3d 100755 --- 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 0bc668a906e..7d7ad0c81db 100755 --- 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 cac22153213..d69f765d13d 100755 --- 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 95b819fd82b..809caea7eb2 100755 --- 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 670e33e3408..f46a2448dd9 100755 --- 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 e73eed20cc0..43ab697fdc7 100755 --- 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 11b600800a4..5af7c7c0e4c 100755 --- 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 c6e70bf4e94..073c93ccd97 100755 --- 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 9bed5903914..e08075132ae 100755 --- 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 6642b1759f9..1652b8a3e5f 100755 --- 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 42ec635fb65..c287a991801 100755 --- 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 ee976cba107..7ddaaa007cc 100755 --- 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 04349e2d153..44e60931bb9 100755 --- 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 e7a825002e5..24221f61a61 100755 --- 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 a5d94ffbf89..d4fa2fda802 100755 --- 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 61827145bc2..cc9ace0a8dd 100755 --- 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 215d0942a80..86bd6162d58 100755 --- 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 95e79fdd491..80511cadc3c 100755 --- 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 255d58d2156..52117eff250 100755 --- 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 62a307709be..01dbb5db8ee 100755 --- 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 48e16dfed8c..dbeeb0ad157 100755 --- 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 a961405a74f..6def50accfe 100755 --- 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 6dbc0cf639c..67c4f64a7f3 100755 --- 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 ae2434b25e6..a2032a9a8ea 100755 --- 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 50732cab330..737d87aba90 100755 --- 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 334c684d17c..e19af4b74c0 100755 --- 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 846188fc716..029ad51b3fb 100755 --- 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