ctdb-tests: Move takeover tests to UNIT/ subdirectory

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

diff --git a/ctdb/tests/takeover/README b/ctdb/tests/UNIT/takeover/README
similarity index 100%
rename from ctdb/tests/takeover/README
rename to ctdb/tests/UNIT/takeover/README

diff --git a/ctdb/tests/takeover/det.001.sh b/ctdb/tests/UNIT/takeover/det.001.sh
similarity index 100%
rename from ctdb/tests/takeover/det.001.sh
rename to ctdb/tests/UNIT/takeover/det.001.sh

diff --git a/ctdb/tests/takeover/det.002.sh b/ctdb/tests/UNIT/takeover/det.002.sh
similarity index 100%
rename from ctdb/tests/takeover/det.002.sh
rename to ctdb/tests/UNIT/takeover/det.002.sh

diff --git a/ctdb/tests/takeover/det.003.sh b/ctdb/tests/UNIT/takeover/det.003.sh
similarity index 100%
rename from ctdb/tests/takeover/det.003.sh
rename to ctdb/tests/UNIT/takeover/det.003.sh

diff --git a/ctdb/tests/takeover/lcp2.001.sh b/ctdb/tests/UNIT/takeover/lcp2.001.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.001.sh
rename to ctdb/tests/UNIT/takeover/lcp2.001.sh

diff --git a/ctdb/tests/takeover/lcp2.002.sh b/ctdb/tests/UNIT/takeover/lcp2.002.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.002.sh
rename to ctdb/tests/UNIT/takeover/lcp2.002.sh

diff --git a/ctdb/tests/takeover/lcp2.003.sh b/ctdb/tests/UNIT/takeover/lcp2.003.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.003.sh
rename to ctdb/tests/UNIT/takeover/lcp2.003.sh

diff --git a/ctdb/tests/takeover/lcp2.004.sh b/ctdb/tests/UNIT/takeover/lcp2.004.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.004.sh
rename to ctdb/tests/UNIT/takeover/lcp2.004.sh

diff --git a/ctdb/tests/takeover/lcp2.005.sh b/ctdb/tests/UNIT/takeover/lcp2.005.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.005.sh
rename to ctdb/tests/UNIT/takeover/lcp2.005.sh

diff --git a/ctdb/tests/takeover/lcp2.006.sh b/ctdb/tests/UNIT/takeover/lcp2.006.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.006.sh
rename to ctdb/tests/UNIT/takeover/lcp2.006.sh

diff --git a/ctdb/tests/takeover/lcp2.007.sh b/ctdb/tests/UNIT/takeover/lcp2.007.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.007.sh
rename to ctdb/tests/UNIT/takeover/lcp2.007.sh

diff --git a/ctdb/tests/takeover/lcp2.008.sh b/ctdb/tests/UNIT/takeover/lcp2.008.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.008.sh
rename to ctdb/tests/UNIT/takeover/lcp2.008.sh

diff --git a/ctdb/tests/takeover/lcp2.009.sh b/ctdb/tests/UNIT/takeover/lcp2.009.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.009.sh
rename to ctdb/tests/UNIT/takeover/lcp2.009.sh

diff --git a/ctdb/tests/takeover/lcp2.010.sh b/ctdb/tests/UNIT/takeover/lcp2.010.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.010.sh
rename to ctdb/tests/UNIT/takeover/lcp2.010.sh

diff --git a/ctdb/tests/takeover/lcp2.011.sh b/ctdb/tests/UNIT/takeover/lcp2.011.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.011.sh
rename to ctdb/tests/UNIT/takeover/lcp2.011.sh

diff --git a/ctdb/tests/takeover/lcp2.012.sh b/ctdb/tests/UNIT/takeover/lcp2.012.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.012.sh
rename to ctdb/tests/UNIT/takeover/lcp2.012.sh

diff --git a/ctdb/tests/takeover/lcp2.013.sh b/ctdb/tests/UNIT/takeover/lcp2.013.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.013.sh
rename to ctdb/tests/UNIT/takeover/lcp2.013.sh

diff --git a/ctdb/tests/takeover/lcp2.014.sh b/ctdb/tests/UNIT/takeover/lcp2.014.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.014.sh
rename to ctdb/tests/UNIT/takeover/lcp2.014.sh

diff --git a/ctdb/tests/takeover/lcp2.015.sh b/ctdb/tests/UNIT/takeover/lcp2.015.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.015.sh
rename to ctdb/tests/UNIT/takeover/lcp2.015.sh

diff --git a/ctdb/tests/takeover/lcp2.016.sh b/ctdb/tests/UNIT/takeover/lcp2.016.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.016.sh
rename to ctdb/tests/UNIT/takeover/lcp2.016.sh

diff --git a/ctdb/tests/takeover/lcp2.024.sh b/ctdb/tests/UNIT/takeover/lcp2.024.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.024.sh
rename to ctdb/tests/UNIT/takeover/lcp2.024.sh

diff --git a/ctdb/tests/takeover/lcp2.025.sh b/ctdb/tests/UNIT/takeover/lcp2.025.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.025.sh
rename to ctdb/tests/UNIT/takeover/lcp2.025.sh

diff --git a/ctdb/tests/takeover/lcp2.027.sh b/ctdb/tests/UNIT/takeover/lcp2.027.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.027.sh
rename to ctdb/tests/UNIT/takeover/lcp2.027.sh

diff --git a/ctdb/tests/takeover/lcp2.028.sh b/ctdb/tests/UNIT/takeover/lcp2.028.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.028.sh
rename to ctdb/tests/UNIT/takeover/lcp2.028.sh

diff --git a/ctdb/tests/takeover/lcp2.029.sh b/ctdb/tests/UNIT/takeover/lcp2.029.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.029.sh
rename to ctdb/tests/UNIT/takeover/lcp2.029.sh

diff --git a/ctdb/tests/takeover/lcp2.030.sh b/ctdb/tests/UNIT/takeover/lcp2.030.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.030.sh
rename to ctdb/tests/UNIT/takeover/lcp2.030.sh

diff --git a/ctdb/tests/takeover/lcp2.031.sh b/ctdb/tests/UNIT/takeover/lcp2.031.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.031.sh
rename to ctdb/tests/UNIT/takeover/lcp2.031.sh

diff --git a/ctdb/tests/takeover/lcp2.032.sh b/ctdb/tests/UNIT/takeover/lcp2.032.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.032.sh
rename to ctdb/tests/UNIT/takeover/lcp2.032.sh

diff --git a/ctdb/tests/takeover/lcp2.033.sh b/ctdb/tests/UNIT/takeover/lcp2.033.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.033.sh
rename to ctdb/tests/UNIT/takeover/lcp2.033.sh

diff --git a/ctdb/tests/takeover/lcp2.034.sh b/ctdb/tests/UNIT/takeover/lcp2.034.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.034.sh
rename to ctdb/tests/UNIT/takeover/lcp2.034.sh

diff --git a/ctdb/tests/takeover/lcp2.035.sh b/ctdb/tests/UNIT/takeover/lcp2.035.sh
similarity index 100%
rename from ctdb/tests/takeover/lcp2.035.sh
rename to ctdb/tests/UNIT/takeover/lcp2.035.sh

diff --git a/ctdb/tests/takeover/nondet.001.sh b/ctdb/tests/UNIT/takeover/nondet.001.sh
similarity index 100%
rename from ctdb/tests/takeover/nondet.001.sh
rename to ctdb/tests/UNIT/takeover/nondet.001.sh

diff --git a/ctdb/tests/takeover/nondet.002.sh b/ctdb/tests/UNIT/takeover/nondet.002.sh
similarity index 100%
rename from ctdb/tests/takeover/nondet.002.sh
rename to ctdb/tests/UNIT/takeover/nondet.002.sh

diff --git a/ctdb/tests/takeover/nondet.003.sh b/ctdb/tests/UNIT/takeover/nondet.003.sh
similarity index 100%
rename from ctdb/tests/takeover/nondet.003.sh
rename to ctdb/tests/UNIT/takeover/nondet.003.sh

diff --git a/ctdb/tests/takeover/scripts/local.sh b/ctdb/tests/UNIT/takeover/scripts/local.sh
similarity index 100%
rename from ctdb/tests/takeover/scripts/local.sh
rename to ctdb/tests/UNIT/takeover/scripts/local.sh

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 0a3cefb0f867412737bd3d145846276d446f042d..5dc14894ad859e5c6db4b0df7ba3f81c25c4487e 100755 (executable)
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -308,7 +308,7 @@ unit_tests="
        UNIT/eventscripts
        UNIT/onnode
        UNIT/shellcheck
-       takeover
+       UNIT/takeover
        takeover_helper
        tool
 "

diff --git a/ctdb/wscript b/ctdb/wscript
index 9d7102d16a2ed50968d6b6d44cee0a33f555070f..3c4890cd04344d19bcad8b0dc8ad73562cbe9d15 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1052,7 +1052,6 @@ def build(bld):
         'complex',
         'etc-ctdb',
         'simple',
-        'takeover',
         'takeover_helper',
         'tool'
     ]