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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

54 files changed, 6 insertions, 6 deletions

diff --git a/ctdb/tests/simple/24_ctdb_getdbmap.sh b/ctdb/tests/INTEGRATION/database/basics.001.attach.sh
index 32d6d26a4ff..32d6d26a4ff 100755
--- a/ctdb/tests/simple/24_ctdb_getdbmap.sh
+++ b/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
index b9ae9481d91..b9ae9481d91 100755
--- a/ctdb/tests/simple/21_ctdb_attach.sh
+++ b/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
index 5d1e12328c6..5d1e12328c6 100755
--- a/ctdb/tests/simple/27_ctdb_detach.sh
+++ b/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
index 9305339d1e3..9305339d1e3 100755
--- a/ctdb/tests/simple/71_ctdb_wipedb.sh
+++ b/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
index 579233e0e80..579233e0e80 100755
--- a/ctdb/tests/simple/58_ctdb_restoredb.sh
+++ b/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
index 05632024cb5..05632024cb5 100755
--- a/ctdb/tests/simple/52_fetch_ring.sh
+++ b/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
index a83b4d31530..a83b4d31530 100755
--- a/ctdb/tests/simple/75_readonly_records_basic.sh
+++ b/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
index a8bc2d95ef6..a8bc2d95ef6 100755
--- a/ctdb/tests/simple/77_ctdb_db_recovery.sh
+++ b/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
index 4f544fa8475..4f544fa8475 100755
--- a/ctdb/tests/simple/78_ctdb_large_db_recovery.sh
+++ b/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
index 51d806a5d47..51d806a5d47 100755
--- a/ctdb/tests/simple/69_recovery_resurrect_deleted.sh
+++ b/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
index 84e0ec15c43..84e0ec15c43 100755
--- a/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
+++ b/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
index 81aa6e089d3..81aa6e089d3 100755
--- a/ctdb/tests/simple/76_ctdb_pdb_recovery.sh
+++ b/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
index 72b18348398..72b18348398 100755
--- a/ctdb/tests/simple/55_ctdb_ptrans.sh
+++ b/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
index d47761216ce..d47761216ce 100755
--- a/ctdb/tests/simple/53_transaction_loop.sh
+++ b/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
index 7beacb9c913..7beacb9c913 100755
--- a/ctdb/tests/simple/54_transaction_loop_recovery.sh
+++ b/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
index 90b5ee06151..90b5ee06151 100755
--- a/ctdb/tests/simple/72_update_record_persistent.sh
+++ b/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
index 4d5c1297fa9..4d5c1297fa9 100755
--- a/ctdb/tests/simple/56_replicated_transaction_recovery.sh
+++ b/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
index 7f3007d5105..7f3007d5105 100755
--- a/ctdb/tests/simple/79_volatile_db_traverse.sh
+++ b/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
index d28f9c2814e..d28f9c2814e 100755
--- a/ctdb/tests/simple/80_ctdb_traverse.sh
+++ b/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
index d9fdd28f775..d9fdd28f775 100755
--- a/ctdb/tests/simple/11_ctdb_ip.sh
+++ b/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
index aefed54c45e..aefed54c45e 100755
--- a/ctdb/tests/simple/16_ctdb_config_add_ip.sh
+++ b/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
index d3f0f3a012b..d3f0f3a012b 100755
--- a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
+++ b/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
index 451fca3a866..451fca3a866 100755
--- a/ctdb/tests/simple/18_ctdb_reloadips.sh
+++ b/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
index d162f0e5fba..d162f0e5fba 100755
--- a/ctdb/tests/simple/19_ip_takeover_noop.sh
+++ b/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
index 2756f64ceb1..2756f64ceb1 100755
--- a/ctdb/tests/simple/20_delip_iface_gc.sh
+++ b/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
index 699ccc3d2ee..699ccc3d2ee 100755
--- a/ctdb/tests/simple/23_ctdb_moveip.sh
+++ b/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
index c0bb62d1991..c0bb62d1991 100755
--- a/ctdb/tests/simple/32_ctdb_disable_enable.sh
+++ b/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
index d9a64508180..d9a64508180 100755
--- a/ctdb/tests/simple/42_ctdb_stop_continue.sh
+++ b/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
index 9af55d8e7ef..9af55d8e7ef 100755
--- a/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
+++ b/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
index 5b11f9f3885..5b11f9f3885 100755
--- a/ctdb/tests/simple/60_recoverd_missing_ip.sh
+++ b/ctdb/tests/INTEGRATION/failover/pubips.050.missing_ip.sh
diff --git a/ctdb/tests/simple/README b/ctdb/tests/INTEGRATION/simple/README
index 3ac738dc6ce..3ac738dc6ce 100644
--- a/ctdb/tests/simple/README
+++ b/ctdb/tests/INTEGRATION/simple/README
diff --git a/ctdb/tests/simple/00_ctdb_onnode.sh b/ctdb/tests/INTEGRATION/simple/basics.000.onnode.sh
index 7e74c088847..7e74c088847 100755
--- a/ctdb/tests/simple/00_ctdb_onnode.sh
+++ b/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
index 722c9d2a035..722c9d2a035 100755
--- a/ctdb/tests/simple/05_ctdb_listnodes.sh
+++ b/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
index 2e7a08b6f6f..2e7a08b6f6f 100755
--- a/ctdb/tests/simple/02_ctdb_tunables.sh
+++ b/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
index b911b896f99..b911b896f99 100755
--- a/ctdb/tests/simple/09_ctdb_ping.sh
+++ b/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
index 48540d052b2..48540d052b2 100755
--- a/ctdb/tests/simple/06_ctdb_getpid.sh
+++ b/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
index ae331bcec33..ae331bcec33 100755
--- a/ctdb/tests/simple/07_ctdb_process_exists.sh
+++ b/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
index cda6e5f478e..cda6e5f478e 100755
--- a/ctdb/tests/simple/14_ctdb_statistics.sh
+++ b/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
index 1dce7b39965..1dce7b39965 100755
--- a/ctdb/tests/simple/15_ctdb_statisticsreset.sh
+++ b/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
index 68e22879ba3..68e22879ba3 100755
--- a/ctdb/tests/simple/08_ctdb_isnotrecmaster.sh
+++ b/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
index f32a784863f..f32a784863f 100755
--- a/ctdb/tests/simple/43_stop_recmaster_yield.sh
+++ b/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
index 8cedd34045b..8cedd34045b 100755
--- a/ctdb/tests/simple/35_ctdb_getreclock.sh
+++ b/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
index 1e1bb1b588f..1e1bb1b588f 100755
--- a/ctdb/tests/simple/01_ctdb_reclock_command.sh
+++ b/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
index 6f90c8fd5bb..6f90c8fd5bb 100755
--- a/ctdb/tests/simple/51_message_ring.sh
+++ b/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
index c78c4209ea6..c78c4209ea6 100755
--- a/ctdb/tests/simple/81_tunnel_ring.sh
+++ b/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
index d7c0c0f9100..d7c0c0f9100 100755
--- a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
+++ b/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
index 5329b49b23a..5329b49b23a 100755
--- a/ctdb/tests/simple/91_version_check.sh
+++ b/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
index 979392f9a1d..979392f9a1d 100755
--- a/ctdb/tests/simple/12_ctdb_getdebug.sh
+++ b/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
index 3e04ca33733..3e04ca33733 100755
--- a/ctdb/tests/simple/13_ctdb_setdebug.sh
+++ b/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
index 3d976c17d0f..3d976c17d0f 100755
--- a/ctdb/tests/simple/25_dumpmemory.sh
+++ b/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
index 2e536da5e6a..2e536da5e6a 100755
--- a/ctdb/tests/simple/28_zero_eventscripts.sh
+++ b/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
index af045cf785e..af045cf785e 100755
--- a/ctdb/tests/simple/90_debug_hung_script.sh
+++ b/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: