From: Martin Schwenke Date: Mon, 9 Sep 2019 06:00:52 +0000 (+1000) Subject: ctdb-tests: Move simple tests to INTEGRATION/ subdirectory X-Git-Tag: talloc-2.3.1~654 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a5c4a60e156170f8aaa738672ed6dc50712a929;p=thirdparty%2Fsamba.git ctdb-tests: Move simple tests to INTEGRATION/ subdirectory Split some tests out into database/ and failover/ subdirectories. Rename the remaining tests in simple/. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/simple/24_ctdb_getdbmap.sh b/ctdb/tests/INTEGRATION/database/basics.001.attach.sh similarity index 100% rename from ctdb/tests/simple/24_ctdb_getdbmap.sh rename to ctdb/tests/INTEGRATION/database/basics.001.attach.sh diff --git a/ctdb/tests/simple/21_ctdb_attach.sh b/ctdb/tests/INTEGRATION/database/basics.002.attach.sh similarity index 100% rename from ctdb/tests/simple/21_ctdb_attach.sh rename to ctdb/tests/INTEGRATION/database/basics.002.attach.sh diff --git a/ctdb/tests/simple/27_ctdb_detach.sh b/ctdb/tests/INTEGRATION/database/basics.003.detach.sh similarity index 100% rename from ctdb/tests/simple/27_ctdb_detach.sh rename to ctdb/tests/INTEGRATION/database/basics.003.detach.sh diff --git a/ctdb/tests/simple/71_ctdb_wipedb.sh b/ctdb/tests/INTEGRATION/database/basics.004.wipe.sh similarity index 100% rename from ctdb/tests/simple/71_ctdb_wipedb.sh rename to ctdb/tests/INTEGRATION/database/basics.004.wipe.sh diff --git a/ctdb/tests/simple/58_ctdb_restoredb.sh b/ctdb/tests/INTEGRATION/database/basics.010.backup_restore.sh similarity index 100% rename from ctdb/tests/simple/58_ctdb_restoredb.sh rename to ctdb/tests/INTEGRATION/database/basics.010.backup_restore.sh diff --git a/ctdb/tests/simple/52_fetch_ring.sh b/ctdb/tests/INTEGRATION/database/fetch.001.ring.sh similarity index 100% rename from ctdb/tests/simple/52_fetch_ring.sh rename to ctdb/tests/INTEGRATION/database/fetch.001.ring.sh diff --git a/ctdb/tests/simple/75_readonly_records_basic.sh b/ctdb/tests/INTEGRATION/database/readonly.001.basic.sh similarity index 100% rename from ctdb/tests/simple/75_readonly_records_basic.sh rename to ctdb/tests/INTEGRATION/database/readonly.001.basic.sh diff --git a/ctdb/tests/simple/77_ctdb_db_recovery.sh b/ctdb/tests/INTEGRATION/database/recovery.001.volatile.sh similarity index 100% rename from ctdb/tests/simple/77_ctdb_db_recovery.sh rename to ctdb/tests/INTEGRATION/database/recovery.001.volatile.sh diff --git a/ctdb/tests/simple/78_ctdb_large_db_recovery.sh b/ctdb/tests/INTEGRATION/database/recovery.002.large.sh similarity index 100% rename from ctdb/tests/simple/78_ctdb_large_db_recovery.sh rename to ctdb/tests/INTEGRATION/database/recovery.002.large.sh diff --git a/ctdb/tests/simple/69_recovery_resurrect_deleted.sh b/ctdb/tests/INTEGRATION/database/recovery.003.no_resurrect.sh similarity index 100% rename from ctdb/tests/simple/69_recovery_resurrect_deleted.sh rename to ctdb/tests/INTEGRATION/database/recovery.003.no_resurrect.sh diff --git a/ctdb/tests/simple/70_recoverpdbbyseqnum.sh b/ctdb/tests/INTEGRATION/database/recovery.010.persistent.sh similarity index 100% rename from ctdb/tests/simple/70_recoverpdbbyseqnum.sh rename to ctdb/tests/INTEGRATION/database/recovery.010.persistent.sh diff --git a/ctdb/tests/simple/76_ctdb_pdb_recovery.sh b/ctdb/tests/INTEGRATION/database/recovery.011.continue.sh similarity index 100% rename from ctdb/tests/simple/76_ctdb_pdb_recovery.sh rename to ctdb/tests/INTEGRATION/database/recovery.011.continue.sh diff --git a/ctdb/tests/simple/55_ctdb_ptrans.sh b/ctdb/tests/INTEGRATION/database/transaction.001.ptrans.sh similarity index 100% rename from ctdb/tests/simple/55_ctdb_ptrans.sh rename to ctdb/tests/INTEGRATION/database/transaction.001.ptrans.sh diff --git a/ctdb/tests/simple/53_transaction_loop.sh b/ctdb/tests/INTEGRATION/database/transaction.002.loop.sh similarity index 100% rename from ctdb/tests/simple/53_transaction_loop.sh rename to ctdb/tests/INTEGRATION/database/transaction.002.loop.sh diff --git a/ctdb/tests/simple/54_transaction_loop_recovery.sh b/ctdb/tests/INTEGRATION/database/transaction.003.loop_recovery.sh similarity index 100% rename from ctdb/tests/simple/54_transaction_loop_recovery.sh rename to ctdb/tests/INTEGRATION/database/transaction.003.loop_recovery.sh diff --git a/ctdb/tests/simple/72_update_record_persistent.sh b/ctdb/tests/INTEGRATION/database/transaction.004.update_record.sh similarity index 100% rename from ctdb/tests/simple/72_update_record_persistent.sh rename to ctdb/tests/INTEGRATION/database/transaction.004.update_record.sh diff --git a/ctdb/tests/simple/56_replicated_transaction_recovery.sh b/ctdb/tests/INTEGRATION/database/transaction.010.loop_recovery.sh similarity index 100% rename from ctdb/tests/simple/56_replicated_transaction_recovery.sh rename to ctdb/tests/INTEGRATION/database/transaction.010.loop_recovery.sh diff --git a/ctdb/tests/simple/79_volatile_db_traverse.sh b/ctdb/tests/INTEGRATION/database/traverse.001.one.sh similarity index 100% rename from ctdb/tests/simple/79_volatile_db_traverse.sh rename to ctdb/tests/INTEGRATION/database/traverse.001.one.sh diff --git a/ctdb/tests/simple/80_ctdb_traverse.sh b/ctdb/tests/INTEGRATION/database/traverse.002.many.sh similarity index 100% rename from ctdb/tests/simple/80_ctdb_traverse.sh rename to ctdb/tests/INTEGRATION/database/traverse.002.many.sh diff --git a/ctdb/tests/simple/11_ctdb_ip.sh b/ctdb/tests/INTEGRATION/failover/pubips.001.list.sh similarity index 100% rename from ctdb/tests/simple/11_ctdb_ip.sh rename to ctdb/tests/INTEGRATION/failover/pubips.001.list.sh diff --git a/ctdb/tests/simple/16_ctdb_config_add_ip.sh b/ctdb/tests/INTEGRATION/failover/pubips.010.addip.sh similarity index 100% rename from ctdb/tests/simple/16_ctdb_config_add_ip.sh rename to ctdb/tests/INTEGRATION/failover/pubips.010.addip.sh diff --git a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh b/ctdb/tests/INTEGRATION/failover/pubips.011.delip.sh similarity index 100% rename from ctdb/tests/simple/17_ctdb_config_delete_ip.sh rename to ctdb/tests/INTEGRATION/failover/pubips.011.delip.sh diff --git a/ctdb/tests/simple/18_ctdb_reloadips.sh b/ctdb/tests/INTEGRATION/failover/pubips.012.reloadips.sh similarity index 100% rename from ctdb/tests/simple/18_ctdb_reloadips.sh rename to ctdb/tests/INTEGRATION/failover/pubips.012.reloadips.sh diff --git a/ctdb/tests/simple/19_ip_takeover_noop.sh b/ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh similarity index 100% rename from ctdb/tests/simple/19_ip_takeover_noop.sh rename to ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh diff --git a/ctdb/tests/simple/20_delip_iface_gc.sh b/ctdb/tests/INTEGRATION/failover/pubips.014.iface_gc.sh similarity index 100% rename from ctdb/tests/simple/20_delip_iface_gc.sh rename to ctdb/tests/INTEGRATION/failover/pubips.014.iface_gc.sh diff --git a/ctdb/tests/simple/23_ctdb_moveip.sh b/ctdb/tests/INTEGRATION/failover/pubips.020.moveip.sh similarity index 100% rename from ctdb/tests/simple/23_ctdb_moveip.sh rename to ctdb/tests/INTEGRATION/failover/pubips.020.moveip.sh diff --git a/ctdb/tests/simple/32_ctdb_disable_enable.sh b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh similarity index 100% rename from ctdb/tests/simple/32_ctdb_disable_enable.sh rename to ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh diff --git a/ctdb/tests/simple/42_ctdb_stop_continue.sh b/ctdb/tests/INTEGRATION/failover/pubips.032.stop_continue.sh similarity index 100% rename from ctdb/tests/simple/42_ctdb_stop_continue.sh rename to ctdb/tests/INTEGRATION/failover/pubips.032.stop_continue.sh diff --git a/ctdb/tests/simple/73_tunable_NoIPTakeover.sh b/ctdb/tests/INTEGRATION/failover/pubips.040.NoIPTakeover.sh similarity index 100% rename from ctdb/tests/simple/73_tunable_NoIPTakeover.sh rename to ctdb/tests/INTEGRATION/failover/pubips.040.NoIPTakeover.sh diff --git a/ctdb/tests/simple/60_recoverd_missing_ip.sh b/ctdb/tests/INTEGRATION/failover/pubips.050.missing_ip.sh similarity index 100% rename from ctdb/tests/simple/60_recoverd_missing_ip.sh rename to ctdb/tests/INTEGRATION/failover/pubips.050.missing_ip.sh diff --git a/ctdb/tests/simple/README b/ctdb/tests/INTEGRATION/simple/README similarity index 100% rename from ctdb/tests/simple/README rename to ctdb/tests/INTEGRATION/simple/README diff --git a/ctdb/tests/simple/00_ctdb_onnode.sh b/ctdb/tests/INTEGRATION/simple/basics.000.onnode.sh similarity index 100% rename from ctdb/tests/simple/00_ctdb_onnode.sh rename to ctdb/tests/INTEGRATION/simple/basics.000.onnode.sh diff --git a/ctdb/tests/simple/05_ctdb_listnodes.sh b/ctdb/tests/INTEGRATION/simple/basics.001.listnodes.sh similarity index 100% rename from ctdb/tests/simple/05_ctdb_listnodes.sh rename to ctdb/tests/INTEGRATION/simple/basics.001.listnodes.sh diff --git a/ctdb/tests/simple/02_ctdb_tunables.sh b/ctdb/tests/INTEGRATION/simple/basics.002.tunables.sh similarity index 100% rename from ctdb/tests/simple/02_ctdb_tunables.sh rename to ctdb/tests/INTEGRATION/simple/basics.002.tunables.sh diff --git a/ctdb/tests/simple/09_ctdb_ping.sh b/ctdb/tests/INTEGRATION/simple/basics.003.ping.sh similarity index 100% rename from ctdb/tests/simple/09_ctdb_ping.sh rename to ctdb/tests/INTEGRATION/simple/basics.003.ping.sh diff --git a/ctdb/tests/simple/06_ctdb_getpid.sh b/ctdb/tests/INTEGRATION/simple/basics.004.getpid.sh similarity index 100% rename from ctdb/tests/simple/06_ctdb_getpid.sh rename to ctdb/tests/INTEGRATION/simple/basics.004.getpid.sh diff --git a/ctdb/tests/simple/07_ctdb_process_exists.sh b/ctdb/tests/INTEGRATION/simple/basics.005.process_exists.sh similarity index 100% rename from ctdb/tests/simple/07_ctdb_process_exists.sh rename to ctdb/tests/INTEGRATION/simple/basics.005.process_exists.sh diff --git a/ctdb/tests/simple/14_ctdb_statistics.sh b/ctdb/tests/INTEGRATION/simple/basics.010.statistics.sh similarity index 100% rename from ctdb/tests/simple/14_ctdb_statistics.sh rename to ctdb/tests/INTEGRATION/simple/basics.010.statistics.sh diff --git a/ctdb/tests/simple/15_ctdb_statisticsreset.sh b/ctdb/tests/INTEGRATION/simple/basics.011.statistics_reset.sh similarity index 100% rename from ctdb/tests/simple/15_ctdb_statisticsreset.sh rename to ctdb/tests/INTEGRATION/simple/basics.011.statistics_reset.sh diff --git a/ctdb/tests/simple/08_ctdb_isnotrecmaster.sh b/ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh similarity index 100% rename from ctdb/tests/simple/08_ctdb_isnotrecmaster.sh rename to ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh diff --git a/ctdb/tests/simple/43_stop_recmaster_yield.sh b/ctdb/tests/INTEGRATION/simple/cluster.002.recmaster_yield.sh similarity index 100% rename from ctdb/tests/simple/43_stop_recmaster_yield.sh rename to ctdb/tests/INTEGRATION/simple/cluster.002.recmaster_yield.sh diff --git a/ctdb/tests/simple/35_ctdb_getreclock.sh b/ctdb/tests/INTEGRATION/simple/cluster.010.getrelock.sh similarity index 100% rename from ctdb/tests/simple/35_ctdb_getreclock.sh rename to ctdb/tests/INTEGRATION/simple/cluster.010.getrelock.sh diff --git a/ctdb/tests/simple/01_ctdb_reclock_command.sh b/ctdb/tests/INTEGRATION/simple/cluster.012.reclock_command.sh similarity index 100% rename from ctdb/tests/simple/01_ctdb_reclock_command.sh rename to ctdb/tests/INTEGRATION/simple/cluster.012.reclock_command.sh diff --git a/ctdb/tests/simple/51_message_ring.sh b/ctdb/tests/INTEGRATION/simple/cluster.020.message_ring.sh similarity index 100% rename from ctdb/tests/simple/51_message_ring.sh rename to ctdb/tests/INTEGRATION/simple/cluster.020.message_ring.sh diff --git a/ctdb/tests/simple/81_tunnel_ring.sh b/ctdb/tests/INTEGRATION/simple/cluster.021.tunnel_ring.sh similarity index 100% rename from ctdb/tests/simple/81_tunnel_ring.sh rename to ctdb/tests/INTEGRATION/simple/cluster.021.tunnel_ring.sh diff --git a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh b/ctdb/tests/INTEGRATION/simple/cluster.090.unreachable.sh similarity index 100% rename from ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh rename to ctdb/tests/INTEGRATION/simple/cluster.090.unreachable.sh diff --git a/ctdb/tests/simple/91_version_check.sh b/ctdb/tests/INTEGRATION/simple/cluster.091.version_check.sh similarity index 100% rename from ctdb/tests/simple/91_version_check.sh rename to ctdb/tests/INTEGRATION/simple/cluster.091.version_check.sh diff --git a/ctdb/tests/simple/12_ctdb_getdebug.sh b/ctdb/tests/INTEGRATION/simple/debug.001.getdebug.sh similarity index 100% rename from ctdb/tests/simple/12_ctdb_getdebug.sh rename to ctdb/tests/INTEGRATION/simple/debug.001.getdebug.sh diff --git a/ctdb/tests/simple/13_ctdb_setdebug.sh b/ctdb/tests/INTEGRATION/simple/debug.002.setdebug.sh similarity index 100% rename from ctdb/tests/simple/13_ctdb_setdebug.sh rename to ctdb/tests/INTEGRATION/simple/debug.002.setdebug.sh diff --git a/ctdb/tests/simple/25_dumpmemory.sh b/ctdb/tests/INTEGRATION/simple/debug.003.dumpmemory.sh similarity index 100% rename from ctdb/tests/simple/25_dumpmemory.sh rename to ctdb/tests/INTEGRATION/simple/debug.003.dumpmemory.sh diff --git a/ctdb/tests/simple/28_zero_eventscripts.sh b/ctdb/tests/INTEGRATION/simple/eventscripts.001.zero_scripts.sh similarity index 100% rename from ctdb/tests/simple/28_zero_eventscripts.sh rename to ctdb/tests/INTEGRATION/simple/eventscripts.001.zero_scripts.sh diff --git a/ctdb/tests/simple/90_debug_hung_script.sh b/ctdb/tests/INTEGRATION/simple/eventscripts.090.debug_hung.sh similarity index 100% rename from ctdb/tests/simple/90_debug_hung_script.sh rename to ctdb/tests/INTEGRATION/simple/eventscripts.090.debug_hung.sh diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh index 829c1de9e84..2d71069edcb 100755 --- a/ctdb/tests/run_tests.sh +++ b/ctdb/tests/run_tests.sh @@ -251,7 +251,7 @@ run_tests () */*/*) die "test \"$f\" is not recognised" ;; - */*|simple) + */*) # This is a test suite subtests=$(echo "${f%/}/"*".sh") if [ "$subtests" = "${f%/}/*.sh" ] ; then @@ -259,7 +259,7 @@ run_tests () die "test \"$f\" is not recognised" fi ;; - CLUSTER|UNIT) + CLUSTER|INTEGRATION|UNIT) # A collection of test suites subtests=$(echo "${f%/}/"*) ;; @@ -307,9 +307,9 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts" # If no tests specified then run some defaults if [ -z "$1" ] ; then if [ -n "$TEST_LOCAL_DAEMONS" ] ; then - set -- UNIT simple + set -- UNIT INTEGRATION else - set -- simple CLUSTER + set -- INTEGRATION CLUSTER fi fi diff --git a/ctdb/wscript b/ctdb/wscript index 5616a5c0a87..2c09fe6ea5e 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -1049,9 +1049,9 @@ def build(bld): test_subdirs = [ 'CLUSTER', + 'INTEGRATION', 'UNIT', - 'etc-ctdb', - 'simple' + 'etc-ctdb' ] if bld.env.standalone_ctdb: