ctdb-tests: Move takeover_helper 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_helper/000.sh b/ctdb/tests/UNIT/takeover_helper/000.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/000.sh
rename to ctdb/tests/UNIT/takeover_helper/000.sh

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

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

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

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

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

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

diff --git a/ctdb/tests/takeover_helper/017.sh b/ctdb/tests/UNIT/takeover_helper/017.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/017.sh
rename to ctdb/tests/UNIT/takeover_helper/017.sh

diff --git a/ctdb/tests/takeover_helper/018.sh b/ctdb/tests/UNIT/takeover_helper/018.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/018.sh
rename to ctdb/tests/UNIT/takeover_helper/018.sh

diff --git a/ctdb/tests/takeover_helper/019.sh b/ctdb/tests/UNIT/takeover_helper/019.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/019.sh
rename to ctdb/tests/UNIT/takeover_helper/019.sh

diff --git a/ctdb/tests/takeover_helper/021.sh b/ctdb/tests/UNIT/takeover_helper/021.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/021.sh
rename to ctdb/tests/UNIT/takeover_helper/021.sh

diff --git a/ctdb/tests/takeover_helper/022.sh b/ctdb/tests/UNIT/takeover_helper/022.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/022.sh
rename to ctdb/tests/UNIT/takeover_helper/022.sh

diff --git a/ctdb/tests/takeover_helper/023.sh b/ctdb/tests/UNIT/takeover_helper/023.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/023.sh
rename to ctdb/tests/UNIT/takeover_helper/023.sh

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

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

diff --git a/ctdb/tests/takeover_helper/026.sh b/ctdb/tests/UNIT/takeover_helper/026.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/026.sh
rename to ctdb/tests/UNIT/takeover_helper/026.sh

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

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

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

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

diff --git a/ctdb/tests/takeover_helper/110.sh b/ctdb/tests/UNIT/takeover_helper/110.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/110.sh
rename to ctdb/tests/UNIT/takeover_helper/110.sh

diff --git a/ctdb/tests/takeover_helper/111.sh b/ctdb/tests/UNIT/takeover_helper/111.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/111.sh
rename to ctdb/tests/UNIT/takeover_helper/111.sh

diff --git a/ctdb/tests/takeover_helper/120.sh b/ctdb/tests/UNIT/takeover_helper/120.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/120.sh
rename to ctdb/tests/UNIT/takeover_helper/120.sh

diff --git a/ctdb/tests/takeover_helper/121.sh b/ctdb/tests/UNIT/takeover_helper/121.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/121.sh
rename to ctdb/tests/UNIT/takeover_helper/121.sh

diff --git a/ctdb/tests/takeover_helper/122.sh b/ctdb/tests/UNIT/takeover_helper/122.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/122.sh
rename to ctdb/tests/UNIT/takeover_helper/122.sh

diff --git a/ctdb/tests/takeover_helper/130.sh b/ctdb/tests/UNIT/takeover_helper/130.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/130.sh
rename to ctdb/tests/UNIT/takeover_helper/130.sh

diff --git a/ctdb/tests/takeover_helper/131.sh b/ctdb/tests/UNIT/takeover_helper/131.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/131.sh
rename to ctdb/tests/UNIT/takeover_helper/131.sh

diff --git a/ctdb/tests/takeover_helper/132.sh b/ctdb/tests/UNIT/takeover_helper/132.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/132.sh
rename to ctdb/tests/UNIT/takeover_helper/132.sh

diff --git a/ctdb/tests/takeover_helper/140.sh b/ctdb/tests/UNIT/takeover_helper/140.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/140.sh
rename to ctdb/tests/UNIT/takeover_helper/140.sh

diff --git a/ctdb/tests/takeover_helper/150.sh b/ctdb/tests/UNIT/takeover_helper/150.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/150.sh
rename to ctdb/tests/UNIT/takeover_helper/150.sh

diff --git a/ctdb/tests/takeover_helper/160.sh b/ctdb/tests/UNIT/takeover_helper/160.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/160.sh
rename to ctdb/tests/UNIT/takeover_helper/160.sh

diff --git a/ctdb/tests/takeover_helper/210.sh b/ctdb/tests/UNIT/takeover_helper/210.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/210.sh
rename to ctdb/tests/UNIT/takeover_helper/210.sh

diff --git a/ctdb/tests/takeover_helper/211.sh b/ctdb/tests/UNIT/takeover_helper/211.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/211.sh
rename to ctdb/tests/UNIT/takeover_helper/211.sh

diff --git a/ctdb/tests/takeover_helper/220.sh b/ctdb/tests/UNIT/takeover_helper/220.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/220.sh
rename to ctdb/tests/UNIT/takeover_helper/220.sh

diff --git a/ctdb/tests/takeover_helper/230.sh b/ctdb/tests/UNIT/takeover_helper/230.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/230.sh
rename to ctdb/tests/UNIT/takeover_helper/230.sh

diff --git a/ctdb/tests/takeover_helper/240.sh b/ctdb/tests/UNIT/takeover_helper/240.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/240.sh
rename to ctdb/tests/UNIT/takeover_helper/240.sh

diff --git a/ctdb/tests/takeover_helper/250.sh b/ctdb/tests/UNIT/takeover_helper/250.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/250.sh
rename to ctdb/tests/UNIT/takeover_helper/250.sh

diff --git a/ctdb/tests/takeover_helper/260.sh b/ctdb/tests/UNIT/takeover_helper/260.sh
similarity index 100%
rename from ctdb/tests/takeover_helper/260.sh
rename to ctdb/tests/UNIT/takeover_helper/260.sh

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

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

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