From: Martin Schwenke Date: Mon, 9 Sep 2019 00:43:38 +0000 (+1000) Subject: ctdb-tests: Move eventd tests to UNIT/ subdirectory X-Git-Tag: talloc-2.3.1~668 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330a106aaa0c91074d5e64978ed6b2e84702336e;p=thirdparty%2Fsamba.git ctdb-tests: Move eventd tests to UNIT/ subdirectory Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/eventd/README b/ctdb/tests/UNIT/eventd/README similarity index 100% rename from ctdb/tests/eventd/README rename to ctdb/tests/UNIT/eventd/README diff --git a/ctdb/tests/eventd/etc-ctdb/ctdb.conf b/ctdb/tests/UNIT/eventd/etc-ctdb/ctdb.conf similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/ctdb.conf rename to ctdb/tests/UNIT/eventd/etc-ctdb/ctdb.conf diff --git a/ctdb/tests/eventd/etc-ctdb/debug-script.sh b/ctdb/tests/UNIT/eventd/etc-ctdb/debug-script.sh similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/debug-script.sh rename to ctdb/tests/UNIT/eventd/etc-ctdb/debug-script.sh diff --git a/ctdb/tests/eventd/etc-ctdb/events/data/03.notalink.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/data/03.notalink.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/data/03.notalink.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/data/03.notalink.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/data/README b/ctdb/tests/UNIT/eventd/etc-ctdb/events/data/README similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/data/README rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/data/README diff --git a/ctdb/tests/eventd/etc-ctdb/events/empty/README b/ctdb/tests/UNIT/eventd/etc-ctdb/events/empty/README similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/empty/README rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/empty/README diff --git a/ctdb/tests/eventd/etc-ctdb/events/multi/01.test.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/multi/01.test.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/multi/01.test.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/multi/01.test.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/multi/02.test.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/multi/02.test.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/multi/02.test.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/multi/02.test.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/multi/03.test.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/multi/03.test.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/multi/03.test.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/multi/03.test.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/random/01.disabled.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/01.disabled.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/random/01.disabled.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/random/01.disabled.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/random/02.enabled.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/02.enabled.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/random/02.enabled.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/random/02.enabled.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/random/README.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/README.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/random/README.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/random/README.script diff --git a/ctdb/tests/eventd/etc-ctdb/events/random/a.script b/ctdb/tests/UNIT/eventd/etc-ctdb/events/random/a.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/events/random/a.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/events/random/a.script diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/data/01.dummy.script b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/data/01.dummy.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/data/01.dummy.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/data/01.dummy.script diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/data/02.disabled.script b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/data/02.disabled.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/data/02.disabled.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/data/02.disabled.script diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/empty/README b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/empty/README similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/empty/README rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/empty/README diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/random/01.disabled.script b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/01.disabled.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/random/01.disabled.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/01.disabled.script diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/random/02.enabled.script b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/02.enabled.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/random/02.enabled.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/02.enabled.script diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/random/README.script b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/README.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/random/README.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/README.script diff --git a/ctdb/tests/eventd/etc-ctdb/share/events/random/a.script b/ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/a.script similarity index 100% rename from ctdb/tests/eventd/etc-ctdb/share/events/random/a.script rename to ctdb/tests/UNIT/eventd/etc-ctdb/share/events/random/a.script diff --git a/ctdb/tests/eventd/eventd_001.sh b/ctdb/tests/UNIT/eventd/eventd_001.sh similarity index 100% rename from ctdb/tests/eventd/eventd_001.sh rename to ctdb/tests/UNIT/eventd/eventd_001.sh diff --git a/ctdb/tests/eventd/eventd_002.sh b/ctdb/tests/UNIT/eventd/eventd_002.sh similarity index 100% rename from ctdb/tests/eventd/eventd_002.sh rename to ctdb/tests/UNIT/eventd/eventd_002.sh diff --git a/ctdb/tests/eventd/eventd_003.sh b/ctdb/tests/UNIT/eventd/eventd_003.sh similarity index 100% rename from ctdb/tests/eventd/eventd_003.sh rename to ctdb/tests/UNIT/eventd/eventd_003.sh diff --git a/ctdb/tests/eventd/eventd_004.sh b/ctdb/tests/UNIT/eventd/eventd_004.sh similarity index 100% rename from ctdb/tests/eventd/eventd_004.sh rename to ctdb/tests/UNIT/eventd/eventd_004.sh diff --git a/ctdb/tests/eventd/eventd_005.sh b/ctdb/tests/UNIT/eventd/eventd_005.sh similarity index 100% rename from ctdb/tests/eventd/eventd_005.sh rename to ctdb/tests/UNIT/eventd/eventd_005.sh diff --git a/ctdb/tests/eventd/eventd_006.sh b/ctdb/tests/UNIT/eventd/eventd_006.sh similarity index 100% rename from ctdb/tests/eventd/eventd_006.sh rename to ctdb/tests/UNIT/eventd/eventd_006.sh diff --git a/ctdb/tests/eventd/eventd_007.sh b/ctdb/tests/UNIT/eventd/eventd_007.sh similarity index 100% rename from ctdb/tests/eventd/eventd_007.sh rename to ctdb/tests/UNIT/eventd/eventd_007.sh diff --git a/ctdb/tests/eventd/eventd_008.sh b/ctdb/tests/UNIT/eventd/eventd_008.sh similarity index 100% rename from ctdb/tests/eventd/eventd_008.sh rename to ctdb/tests/UNIT/eventd/eventd_008.sh diff --git a/ctdb/tests/eventd/eventd_009.sh b/ctdb/tests/UNIT/eventd/eventd_009.sh similarity index 100% rename from ctdb/tests/eventd/eventd_009.sh rename to ctdb/tests/UNIT/eventd/eventd_009.sh diff --git a/ctdb/tests/eventd/eventd_011.sh b/ctdb/tests/UNIT/eventd/eventd_011.sh similarity index 100% rename from ctdb/tests/eventd/eventd_011.sh rename to ctdb/tests/UNIT/eventd/eventd_011.sh diff --git a/ctdb/tests/eventd/eventd_012.sh b/ctdb/tests/UNIT/eventd/eventd_012.sh similarity index 100% rename from ctdb/tests/eventd/eventd_012.sh rename to ctdb/tests/UNIT/eventd/eventd_012.sh diff --git a/ctdb/tests/eventd/eventd_013.sh b/ctdb/tests/UNIT/eventd/eventd_013.sh similarity index 100% rename from ctdb/tests/eventd/eventd_013.sh rename to ctdb/tests/UNIT/eventd/eventd_013.sh diff --git a/ctdb/tests/eventd/eventd_014.sh b/ctdb/tests/UNIT/eventd/eventd_014.sh similarity index 100% rename from ctdb/tests/eventd/eventd_014.sh rename to ctdb/tests/UNIT/eventd/eventd_014.sh diff --git a/ctdb/tests/eventd/eventd_021.sh b/ctdb/tests/UNIT/eventd/eventd_021.sh similarity index 100% rename from ctdb/tests/eventd/eventd_021.sh rename to ctdb/tests/UNIT/eventd/eventd_021.sh diff --git a/ctdb/tests/eventd/eventd_022.sh b/ctdb/tests/UNIT/eventd/eventd_022.sh similarity index 100% rename from ctdb/tests/eventd/eventd_022.sh rename to ctdb/tests/UNIT/eventd/eventd_022.sh diff --git a/ctdb/tests/eventd/eventd_023.sh b/ctdb/tests/UNIT/eventd/eventd_023.sh similarity index 100% rename from ctdb/tests/eventd/eventd_023.sh rename to ctdb/tests/UNIT/eventd/eventd_023.sh diff --git a/ctdb/tests/eventd/eventd_024.sh b/ctdb/tests/UNIT/eventd/eventd_024.sh similarity index 100% rename from ctdb/tests/eventd/eventd_024.sh rename to ctdb/tests/UNIT/eventd/eventd_024.sh diff --git a/ctdb/tests/eventd/eventd_031.sh b/ctdb/tests/UNIT/eventd/eventd_031.sh similarity index 100% rename from ctdb/tests/eventd/eventd_031.sh rename to ctdb/tests/UNIT/eventd/eventd_031.sh diff --git a/ctdb/tests/eventd/eventd_032.sh b/ctdb/tests/UNIT/eventd/eventd_032.sh similarity index 100% rename from ctdb/tests/eventd/eventd_032.sh rename to ctdb/tests/UNIT/eventd/eventd_032.sh diff --git a/ctdb/tests/eventd/eventd_033.sh b/ctdb/tests/UNIT/eventd/eventd_033.sh similarity index 100% rename from ctdb/tests/eventd/eventd_033.sh rename to ctdb/tests/UNIT/eventd/eventd_033.sh diff --git a/ctdb/tests/eventd/eventd_041.sh b/ctdb/tests/UNIT/eventd/eventd_041.sh similarity index 100% rename from ctdb/tests/eventd/eventd_041.sh rename to ctdb/tests/UNIT/eventd/eventd_041.sh diff --git a/ctdb/tests/eventd/eventd_042.sh b/ctdb/tests/UNIT/eventd/eventd_042.sh similarity index 100% rename from ctdb/tests/eventd/eventd_042.sh rename to ctdb/tests/UNIT/eventd/eventd_042.sh diff --git a/ctdb/tests/eventd/eventd_043.sh b/ctdb/tests/UNIT/eventd/eventd_043.sh similarity index 100% rename from ctdb/tests/eventd/eventd_043.sh rename to ctdb/tests/UNIT/eventd/eventd_043.sh diff --git a/ctdb/tests/eventd/eventd_044.sh b/ctdb/tests/UNIT/eventd/eventd_044.sh similarity index 100% rename from ctdb/tests/eventd/eventd_044.sh rename to ctdb/tests/UNIT/eventd/eventd_044.sh diff --git a/ctdb/tests/eventd/eventd_051.sh b/ctdb/tests/UNIT/eventd/eventd_051.sh similarity index 100% rename from ctdb/tests/eventd/eventd_051.sh rename to ctdb/tests/UNIT/eventd/eventd_051.sh diff --git a/ctdb/tests/eventd/eventd_052.sh b/ctdb/tests/UNIT/eventd/eventd_052.sh similarity index 100% rename from ctdb/tests/eventd/eventd_052.sh rename to ctdb/tests/UNIT/eventd/eventd_052.sh diff --git a/ctdb/tests/eventd/scripts/local.sh b/ctdb/tests/UNIT/eventd/scripts/local.sh similarity index 100% rename from ctdb/tests/eventd/scripts/local.sh rename to ctdb/tests/UNIT/eventd/scripts/local.sh diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh index a787db7ba16..ab0a37f3864 100755 --- a/ctdb/tests/run_tests.sh +++ b/ctdb/tests/run_tests.sh @@ -304,7 +304,7 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts" unit_tests=" UNIT/cunit - eventd + UNIT/eventd eventscripts onnode shellcheck diff --git a/ctdb/wscript b/ctdb/wscript index 2c9a718fc76..c4251110c15 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -1051,7 +1051,6 @@ def build(bld): 'UNIT', 'complex', 'etc-ctdb', - 'eventd', 'eventscripts', 'onnode', 'shellcheck',