From: Martin Schwenke Date: Mon, 9 Sep 2019 00:44:45 +0000 (+1000) Subject: ctdb-tests: Move eventscript tests to UNIT/ subdirectory X-Git-Tag: talloc-2.3.1~667 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ed075d396ba5f6f7b7686fb0593984850923f55;p=thirdparty%2Fsamba.git ctdb-tests: Move eventscript tests to UNIT/ subdirectory Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/eventscripts/00.ctdb.init.001.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.001.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.001.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.001.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.002.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.002.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.002.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.002.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.003.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.003.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.003.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.003.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.004.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.004.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.004.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.004.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.005.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.005.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.005.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.005.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.006.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.006.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.006.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.006.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.007.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.007.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.007.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.007.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.008.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.008.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.008.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.008.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.init.009.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.009.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.init.009.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.init.009.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.001.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.setup.001.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.setup.002.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.setup.003.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh similarity index 100% rename from ctdb/tests/eventscripts/00.ctdb.setup.004.sh rename to ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh diff --git a/ctdb/tests/eventscripts/01.reclock.init.001.sh b/ctdb/tests/UNIT/eventscripts/01.reclock.init.001.sh similarity index 100% rename from ctdb/tests/eventscripts/01.reclock.init.001.sh rename to ctdb/tests/UNIT/eventscripts/01.reclock.init.001.sh diff --git a/ctdb/tests/eventscripts/01.reclock.init.002.sh b/ctdb/tests/UNIT/eventscripts/01.reclock.init.002.sh similarity index 100% rename from ctdb/tests/eventscripts/01.reclock.init.002.sh rename to ctdb/tests/UNIT/eventscripts/01.reclock.init.002.sh diff --git a/ctdb/tests/eventscripts/01.reclock.init.003.sh b/ctdb/tests/UNIT/eventscripts/01.reclock.init.003.sh similarity index 100% rename from ctdb/tests/eventscripts/01.reclock.init.003.sh rename to ctdb/tests/UNIT/eventscripts/01.reclock.init.003.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.001.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.001.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.001.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.002.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.003.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.003.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.003.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.004.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.004.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.004.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.004.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.005.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.005.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.005.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.005.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.006.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.006.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.006.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.006.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.007.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.007.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.007.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.007.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.011.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.011.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.011.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.011.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.012.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.012.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.012.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.012.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.014.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.014.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.014.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.014.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.015.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.015.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.015.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.015.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.017.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.017.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.017.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.017.sh diff --git a/ctdb/tests/eventscripts/05.system.monitor.018.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.018.sh similarity index 100% rename from ctdb/tests/eventscripts/05.system.monitor.018.sh rename to ctdb/tests/UNIT/eventscripts/05.system.monitor.018.sh diff --git a/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh similarity index 100% rename from ctdb/tests/eventscripts/06.nfs.releaseip.001.sh rename to ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh diff --git a/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh similarity index 100% rename from ctdb/tests/eventscripts/06.nfs.releaseip.002.sh rename to ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh diff --git a/ctdb/tests/eventscripts/06.nfs.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh similarity index 100% rename from ctdb/tests/eventscripts/06.nfs.takeip.001.sh rename to ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh diff --git a/ctdb/tests/eventscripts/06.nfs.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh similarity index 100% rename from ctdb/tests/eventscripts/06.nfs.takeip.002.sh rename to ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh diff --git a/ctdb/tests/eventscripts/10.interface.010.sh b/ctdb/tests/UNIT/eventscripts/10.interface.010.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.010.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.010.sh diff --git a/ctdb/tests/eventscripts/10.interface.011.sh b/ctdb/tests/UNIT/eventscripts/10.interface.011.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.011.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.011.sh diff --git a/ctdb/tests/eventscripts/10.interface.012.sh b/ctdb/tests/UNIT/eventscripts/10.interface.012.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.012.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.012.sh diff --git a/ctdb/tests/eventscripts/10.interface.013.sh b/ctdb/tests/UNIT/eventscripts/10.interface.013.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.013.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.013.sh diff --git a/ctdb/tests/eventscripts/10.interface.init.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.001.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.init.001.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.init.001.sh diff --git a/ctdb/tests/eventscripts/10.interface.init.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.002.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.init.002.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.init.002.sh diff --git a/ctdb/tests/eventscripts/10.interface.init.021.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.021.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.init.021.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.init.021.sh diff --git a/ctdb/tests/eventscripts/10.interface.init.022.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.022.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.init.022.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.init.022.sh diff --git a/ctdb/tests/eventscripts/10.interface.init.023.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.023.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.init.023.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.init.023.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.001.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.001.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.001.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.002.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.003.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.003.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.003.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.004.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.004.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.004.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.004.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.005.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.005.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.005.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.005.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.006.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.006.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.006.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.006.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.009.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.009.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.009.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.009.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.010.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.010.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.010.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.010.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.011.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.011.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.011.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.011.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.012.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.012.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.012.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.012.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.013.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.013.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.013.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.013.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.014.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.014.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.014.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.014.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.015.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.015.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.015.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.015.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.016.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.016.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.016.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.016.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.017.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.017.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.017.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.017.sh diff --git a/ctdb/tests/eventscripts/10.interface.monitor.018.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.018.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.monitor.018.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.monitor.018.sh diff --git a/ctdb/tests/eventscripts/10.interface.multi.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.multi.001.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.multi.001.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.multi.001.sh diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.releaseip.001.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.releaseip.001.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.releaseip.001.sh diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.releaseip.002.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.releaseip.002.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.releaseip.002.sh diff --git a/ctdb/tests/eventscripts/10.interface.startup.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.startup.001.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.startup.001.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.startup.001.sh diff --git a/ctdb/tests/eventscripts/10.interface.startup.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.startup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.startup.002.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.startup.002.sh diff --git a/ctdb/tests/eventscripts/10.interface.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.001.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.takeip.001.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.takeip.001.sh diff --git a/ctdb/tests/eventscripts/10.interface.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.002.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.takeip.002.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.takeip.002.sh diff --git a/ctdb/tests/eventscripts/10.interface.takeip.003.sh b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.003.sh similarity index 100% rename from ctdb/tests/eventscripts/10.interface.takeip.003.sh rename to ctdb/tests/UNIT/eventscripts/10.interface.takeip.003.sh diff --git a/ctdb/tests/eventscripts/11.natgw.001.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.001.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.001.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.001.sh diff --git a/ctdb/tests/eventscripts/11.natgw.002.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.002.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.002.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.002.sh diff --git a/ctdb/tests/eventscripts/11.natgw.003.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.003.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.003.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.003.sh diff --git a/ctdb/tests/eventscripts/11.natgw.004.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.004.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.004.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.004.sh diff --git a/ctdb/tests/eventscripts/11.natgw.011.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.011.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.011.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.011.sh diff --git a/ctdb/tests/eventscripts/11.natgw.012.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.012.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.012.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.012.sh diff --git a/ctdb/tests/eventscripts/11.natgw.013.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.013.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.013.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.013.sh diff --git a/ctdb/tests/eventscripts/11.natgw.014.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.014.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.014.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.014.sh diff --git a/ctdb/tests/eventscripts/11.natgw.015.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.015.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.015.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.015.sh diff --git a/ctdb/tests/eventscripts/11.natgw.021.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.021.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.021.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.021.sh diff --git a/ctdb/tests/eventscripts/11.natgw.022.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.022.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.022.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.022.sh diff --git a/ctdb/tests/eventscripts/11.natgw.023.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.023.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.023.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.023.sh diff --git a/ctdb/tests/eventscripts/11.natgw.024.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.024.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.024.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.024.sh diff --git a/ctdb/tests/eventscripts/11.natgw.025.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.025.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.025.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.025.sh diff --git a/ctdb/tests/eventscripts/11.natgw.031.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.031.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.031.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.031.sh diff --git a/ctdb/tests/eventscripts/11.natgw.041.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.041.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.041.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.041.sh diff --git a/ctdb/tests/eventscripts/11.natgw.042.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.042.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.042.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.042.sh diff --git a/ctdb/tests/eventscripts/11.natgw.051.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.051.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.051.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.051.sh diff --git a/ctdb/tests/eventscripts/11.natgw.052.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.052.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.052.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.052.sh diff --git a/ctdb/tests/eventscripts/11.natgw.053.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.053.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.053.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.053.sh diff --git a/ctdb/tests/eventscripts/11.natgw.054.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.054.sh similarity index 100% rename from ctdb/tests/eventscripts/11.natgw.054.sh rename to ctdb/tests/UNIT/eventscripts/11.natgw.054.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.001.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.001.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.001.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.001.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.002.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.002.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.002.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.002.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.003.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.003.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.003.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.003.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.004.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.004.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.004.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.004.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.005.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.005.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.005.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.005.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.006.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.006.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.006.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.006.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.007.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.007.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.007.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.007.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.008.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.008.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.008.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.008.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.009.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.009.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.009.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.009.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.010.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.010.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.010.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.010.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.011.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.011.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.011.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.012.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.012.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.012.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.012.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.013.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.013.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.013.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.013.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.014.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.014.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.014.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.014.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.015.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.015.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.016.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.016.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.016.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.016.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.017.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.017.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.017.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.018.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.018.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.018.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.018.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.019.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.019.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.019.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.019.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.021.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.021.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.021.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.022.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.022.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.022.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.023.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.023.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.023.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.023.sh diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh similarity index 100% rename from ctdb/tests/eventscripts/13.per_ip_routing.024.sh rename to ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.001.sh similarity index 100% rename from ctdb/tests/eventscripts/20.multipathd.monitor.001.sh rename to ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.001.sh diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/20.multipathd.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.002.sh diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.003.sh similarity index 100% rename from ctdb/tests/eventscripts/20.multipathd.monitor.003.sh rename to ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.003.sh diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.004.sh similarity index 100% rename from ctdb/tests/eventscripts/20.multipathd.monitor.004.sh rename to ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.004.sh diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/31.clamd.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/31.clamd.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/31.clamd.monitor.002.sh diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/31.clamd.monitor.003.sh similarity index 100% rename from ctdb/tests/eventscripts/31.clamd.monitor.003.sh rename to ctdb/tests/UNIT/eventscripts/31.clamd.monitor.003.sh diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.shutdown.002.sh similarity index 100% rename from ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh rename to ctdb/tests/UNIT/eventscripts/40.vsftpd.shutdown.002.sh diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.startup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/40.vsftpd.startup.002.sh rename to ctdb/tests/UNIT/eventscripts/40.vsftpd.startup.002.sh diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/41.httpd.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/41.httpd.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/41.httpd.monitor.002.sh diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/41.httpd.shutdown.002.sh similarity index 100% rename from ctdb/tests/eventscripts/41.httpd.shutdown.002.sh rename to ctdb/tests/UNIT/eventscripts/41.httpd.shutdown.002.sh diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/UNIT/eventscripts/41.httpd.startup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/41.httpd.startup.002.sh rename to ctdb/tests/UNIT/eventscripts/41.httpd.startup.002.sh diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.101.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.monitor.101.sh similarity index 100% rename from ctdb/tests/eventscripts/49.winbind.monitor.101.sh rename to ctdb/tests/UNIT/eventscripts/49.winbind.monitor.101.sh diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.102.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.monitor.102.sh similarity index 100% rename from ctdb/tests/eventscripts/49.winbind.monitor.102.sh rename to ctdb/tests/UNIT/eventscripts/49.winbind.monitor.102.sh diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.shutdown.002.sh similarity index 100% rename from ctdb/tests/eventscripts/49.winbind.shutdown.002.sh rename to ctdb/tests/UNIT/eventscripts/49.winbind.shutdown.002.sh diff --git a/ctdb/tests/eventscripts/49.winbind.startup.002.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.startup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/49.winbind.startup.002.sh rename to ctdb/tests/UNIT/eventscripts/49.winbind.startup.002.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.101.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.101.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.101.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.101.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.103.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.103.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.103.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.103.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.104.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.104.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.104.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.104.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.105.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.106.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.106.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.106.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.106.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.110.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.110.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.110.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.110.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.111.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.111.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.111.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.111.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.112.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.112.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh diff --git a/ctdb/tests/eventscripts/50.samba.monitor.113.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.monitor.113.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.001.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.001.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.shutdown.001.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.shutdown.001.sh diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.002.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.shutdown.002.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.shutdown.002.sh diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.011.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.shutdown.011.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh diff --git a/ctdb/tests/eventscripts/50.samba.startup.011.sh b/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh similarity index 100% rename from ctdb/tests/eventscripts/50.samba.startup.011.sh rename to ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.101.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.101.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.101.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.101.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.102.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.102.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.102.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.102.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.103.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.103.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.103.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.103.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.104.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.104.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.104.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.104.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.105.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.106.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.106.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.107.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.107.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.107.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.107.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.108.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.108.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.108.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.108.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.109.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.109.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.109.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.109.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.111.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.111.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.112.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.112.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.113.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.114.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.121.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.121.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.122.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.122.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.131.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.131.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.132.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.132.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.141.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.141.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.142.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.142.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.143.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.144.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.144.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.151.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.151.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.152.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.152.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.153.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.153.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.161.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.161.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.162.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.162.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.monitor.162.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.monitor.162.sh diff --git a/ctdb/tests/eventscripts/60.nfs.multi.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.multi.001.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.multi.001.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.multi.001.sh diff --git a/ctdb/tests/eventscripts/60.nfs.multi.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.multi.002.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.multi.002.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.multi.002.sh diff --git a/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.001.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.releaseip.001.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.001.sh diff --git a/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.002.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.releaseip.002.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.002.sh diff --git a/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.001.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.shutdown.001.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.001.sh diff --git a/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.002.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.shutdown.002.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.002.sh diff --git a/ctdb/tests/eventscripts/60.nfs.startup.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.startup.001.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.startup.001.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.startup.001.sh diff --git a/ctdb/tests/eventscripts/60.nfs.startup.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.startup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.startup.002.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.startup.002.sh diff --git a/ctdb/tests/eventscripts/60.nfs.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.takeip.001.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.takeip.001.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.takeip.001.sh diff --git a/ctdb/tests/eventscripts/60.nfs.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.takeip.002.sh similarity index 100% rename from ctdb/tests/eventscripts/60.nfs.takeip.002.sh rename to ctdb/tests/UNIT/eventscripts/60.nfs.takeip.002.sh diff --git a/ctdb/tests/eventscripts/91.lvs.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.001.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.001.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.001.sh diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.011.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.011.sh diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.001.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.monitor.001.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.monitor.001.sh diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.002.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.monitor.002.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.monitor.002.sh diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.003.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.monitor.003.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.monitor.003.sh diff --git a/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.001.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.shutdown.001.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.001.sh diff --git a/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.002.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.shutdown.002.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.002.sh diff --git a/ctdb/tests/eventscripts/91.lvs.startup.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.startup.001.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.startup.001.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.startup.001.sh diff --git a/ctdb/tests/eventscripts/91.lvs.startup.002.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.startup.002.sh similarity index 100% rename from ctdb/tests/eventscripts/91.lvs.startup.002.sh rename to ctdb/tests/UNIT/eventscripts/91.lvs.startup.002.sh diff --git a/ctdb/tests/eventscripts/README b/ctdb/tests/UNIT/eventscripts/README similarity index 100% rename from ctdb/tests/eventscripts/README rename to ctdb/tests/UNIT/eventscripts/README diff --git a/ctdb/tests/eventscripts/etc-ctdb/public_addresses b/ctdb/tests/UNIT/eventscripts/etc-ctdb/public_addresses similarity index 100% rename from ctdb/tests/eventscripts/etc-ctdb/public_addresses rename to ctdb/tests/UNIT/eventscripts/etc-ctdb/public_addresses diff --git a/ctdb/tests/eventscripts/etc-ctdb/rc.local b/ctdb/tests/UNIT/eventscripts/etc-ctdb/rc.local similarity index 100% rename from ctdb/tests/eventscripts/etc-ctdb/rc.local rename to ctdb/tests/UNIT/eventscripts/etc-ctdb/rc.local diff --git a/ctdb/tests/eventscripts/etc/init.d/nfs b/ctdb/tests/UNIT/eventscripts/etc/init.d/nfs similarity index 100% rename from ctdb/tests/eventscripts/etc/init.d/nfs rename to ctdb/tests/UNIT/eventscripts/etc/init.d/nfs diff --git a/ctdb/tests/eventscripts/etc/init.d/nfslock b/ctdb/tests/UNIT/eventscripts/etc/init.d/nfslock similarity index 100% rename from ctdb/tests/eventscripts/etc/init.d/nfslock rename to ctdb/tests/UNIT/eventscripts/etc/init.d/nfslock diff --git a/ctdb/tests/eventscripts/etc/samba/smb.conf b/ctdb/tests/UNIT/eventscripts/etc/samba/smb.conf similarity index 100% rename from ctdb/tests/eventscripts/etc/samba/smb.conf rename to ctdb/tests/UNIT/eventscripts/etc/samba/smb.conf diff --git a/ctdb/tests/eventscripts/etc/sysconfig/nfs b/ctdb/tests/UNIT/eventscripts/etc/sysconfig/nfs similarity index 100% rename from ctdb/tests/eventscripts/etc/sysconfig/nfs rename to ctdb/tests/UNIT/eventscripts/etc/sysconfig/nfs diff --git a/ctdb/tests/eventscripts/scripts/00.ctdb.sh b/ctdb/tests/UNIT/eventscripts/scripts/00.ctdb.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/00.ctdb.sh rename to ctdb/tests/UNIT/eventscripts/scripts/00.ctdb.sh diff --git a/ctdb/tests/eventscripts/scripts/01.reclock.sh b/ctdb/tests/UNIT/eventscripts/scripts/01.reclock.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/01.reclock.sh rename to ctdb/tests/UNIT/eventscripts/scripts/01.reclock.sh diff --git a/ctdb/tests/eventscripts/scripts/05.system.sh b/ctdb/tests/UNIT/eventscripts/scripts/05.system.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/05.system.sh rename to ctdb/tests/UNIT/eventscripts/scripts/05.system.sh diff --git a/ctdb/tests/eventscripts/scripts/06.nfs.sh b/ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/06.nfs.sh rename to ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh diff --git a/ctdb/tests/eventscripts/scripts/10.interface.sh b/ctdb/tests/UNIT/eventscripts/scripts/10.interface.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/10.interface.sh rename to ctdb/tests/UNIT/eventscripts/scripts/10.interface.sh diff --git a/ctdb/tests/eventscripts/scripts/11.natgw.sh b/ctdb/tests/UNIT/eventscripts/scripts/11.natgw.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/11.natgw.sh rename to ctdb/tests/UNIT/eventscripts/scripts/11.natgw.sh diff --git a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh b/ctdb/tests/UNIT/eventscripts/scripts/13.per_ip_routing.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh rename to ctdb/tests/UNIT/eventscripts/scripts/13.per_ip_routing.sh diff --git a/ctdb/tests/eventscripts/scripts/20.multipathd.sh b/ctdb/tests/UNIT/eventscripts/scripts/20.multipathd.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/20.multipathd.sh rename to ctdb/tests/UNIT/eventscripts/scripts/20.multipathd.sh diff --git a/ctdb/tests/eventscripts/scripts/31.clamd.sh b/ctdb/tests/UNIT/eventscripts/scripts/31.clamd.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/31.clamd.sh rename to ctdb/tests/UNIT/eventscripts/scripts/31.clamd.sh diff --git a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh b/ctdb/tests/UNIT/eventscripts/scripts/40.vsftpd.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/40.vsftpd.sh rename to ctdb/tests/UNIT/eventscripts/scripts/40.vsftpd.sh diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/UNIT/eventscripts/scripts/41.httpd.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/41.httpd.sh rename to ctdb/tests/UNIT/eventscripts/scripts/41.httpd.sh diff --git a/ctdb/tests/eventscripts/scripts/49.winbind.sh b/ctdb/tests/UNIT/eventscripts/scripts/49.winbind.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/49.winbind.sh rename to ctdb/tests/UNIT/eventscripts/scripts/49.winbind.sh diff --git a/ctdb/tests/eventscripts/scripts/50.samba.sh b/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/50.samba.sh rename to ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/60.nfs.sh rename to ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh diff --git a/ctdb/tests/eventscripts/scripts/91.lvs.sh b/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/91.lvs.sh rename to ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/UNIT/eventscripts/scripts/local.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/local.sh rename to ctdb/tests/UNIT/eventscripts/scripts/local.sh diff --git a/ctdb/tests/eventscripts/scripts/statd-callout.sh b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh similarity index 100% rename from ctdb/tests/eventscripts/scripts/statd-callout.sh rename to ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh diff --git a/ctdb/tests/eventscripts/statd-callout.001.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.001.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.001.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.001.sh diff --git a/ctdb/tests/eventscripts/statd-callout.002.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.002.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.002.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.002.sh diff --git a/ctdb/tests/eventscripts/statd-callout.003.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.003.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.003.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.003.sh diff --git a/ctdb/tests/eventscripts/statd-callout.004.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.004.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.004.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.004.sh diff --git a/ctdb/tests/eventscripts/statd-callout.005.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.005.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.005.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.005.sh diff --git a/ctdb/tests/eventscripts/statd-callout.006.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.006.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.006.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.006.sh diff --git a/ctdb/tests/eventscripts/statd-callout.007.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.007.sh similarity index 100% rename from ctdb/tests/eventscripts/statd-callout.007.sh rename to ctdb/tests/UNIT/eventscripts/statd-callout.007.sh diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/UNIT/eventscripts/stubs/ctdb similarity index 100% rename from ctdb/tests/eventscripts/stubs/ctdb rename to ctdb/tests/UNIT/eventscripts/stubs/ctdb diff --git a/ctdb/tests/eventscripts/stubs/ctdb-config b/ctdb/tests/UNIT/eventscripts/stubs/ctdb-config similarity index 100% rename from ctdb/tests/eventscripts/stubs/ctdb-config rename to ctdb/tests/UNIT/eventscripts/stubs/ctdb-config diff --git a/ctdb/tests/eventscripts/stubs/ctdb_killtcp b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_killtcp similarity index 100% rename from ctdb/tests/eventscripts/stubs/ctdb_killtcp rename to ctdb/tests/UNIT/eventscripts/stubs/ctdb_killtcp diff --git a/ctdb/tests/eventscripts/stubs/ctdb_lvs b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs similarity index 100% rename from ctdb/tests/eventscripts/stubs/ctdb_lvs rename to ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs diff --git a/ctdb/tests/eventscripts/stubs/ctdb_natgw b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_natgw similarity index 100% rename from ctdb/tests/eventscripts/stubs/ctdb_natgw rename to ctdb/tests/UNIT/eventscripts/stubs/ctdb_natgw diff --git a/ctdb/tests/eventscripts/stubs/date b/ctdb/tests/UNIT/eventscripts/stubs/date similarity index 100% rename from ctdb/tests/eventscripts/stubs/date rename to ctdb/tests/UNIT/eventscripts/stubs/date diff --git a/ctdb/tests/eventscripts/stubs/df b/ctdb/tests/UNIT/eventscripts/stubs/df similarity index 100% rename from ctdb/tests/eventscripts/stubs/df rename to ctdb/tests/UNIT/eventscripts/stubs/df diff --git a/ctdb/tests/eventscripts/stubs/ethtool b/ctdb/tests/UNIT/eventscripts/stubs/ethtool similarity index 100% rename from ctdb/tests/eventscripts/stubs/ethtool rename to ctdb/tests/UNIT/eventscripts/stubs/ethtool diff --git a/ctdb/tests/eventscripts/stubs/exportfs b/ctdb/tests/UNIT/eventscripts/stubs/exportfs similarity index 100% rename from ctdb/tests/eventscripts/stubs/exportfs rename to ctdb/tests/UNIT/eventscripts/stubs/exportfs diff --git a/ctdb/tests/eventscripts/stubs/id b/ctdb/tests/UNIT/eventscripts/stubs/id similarity index 100% rename from ctdb/tests/eventscripts/stubs/id rename to ctdb/tests/UNIT/eventscripts/stubs/id diff --git a/ctdb/tests/eventscripts/stubs/ip b/ctdb/tests/UNIT/eventscripts/stubs/ip similarity index 100% rename from ctdb/tests/eventscripts/stubs/ip rename to ctdb/tests/UNIT/eventscripts/stubs/ip diff --git a/ctdb/tests/eventscripts/stubs/ip6tables b/ctdb/tests/UNIT/eventscripts/stubs/ip6tables similarity index 100% rename from ctdb/tests/eventscripts/stubs/ip6tables rename to ctdb/tests/UNIT/eventscripts/stubs/ip6tables diff --git a/ctdb/tests/eventscripts/stubs/iptables b/ctdb/tests/UNIT/eventscripts/stubs/iptables similarity index 100% rename from ctdb/tests/eventscripts/stubs/iptables rename to ctdb/tests/UNIT/eventscripts/stubs/iptables diff --git a/ctdb/tests/eventscripts/stubs/ipvsadm b/ctdb/tests/UNIT/eventscripts/stubs/ipvsadm similarity index 100% rename from ctdb/tests/eventscripts/stubs/ipvsadm rename to ctdb/tests/UNIT/eventscripts/stubs/ipvsadm diff --git a/ctdb/tests/eventscripts/stubs/kill b/ctdb/tests/UNIT/eventscripts/stubs/kill similarity index 100% rename from ctdb/tests/eventscripts/stubs/kill rename to ctdb/tests/UNIT/eventscripts/stubs/kill diff --git a/ctdb/tests/eventscripts/stubs/killall b/ctdb/tests/UNIT/eventscripts/stubs/killall similarity index 100% rename from ctdb/tests/eventscripts/stubs/killall rename to ctdb/tests/UNIT/eventscripts/stubs/killall diff --git a/ctdb/tests/eventscripts/stubs/multipath b/ctdb/tests/UNIT/eventscripts/stubs/multipath similarity index 100% rename from ctdb/tests/eventscripts/stubs/multipath rename to ctdb/tests/UNIT/eventscripts/stubs/multipath diff --git a/ctdb/tests/eventscripts/stubs/net b/ctdb/tests/UNIT/eventscripts/stubs/net similarity index 100% rename from ctdb/tests/eventscripts/stubs/net rename to ctdb/tests/UNIT/eventscripts/stubs/net diff --git a/ctdb/tests/eventscripts/stubs/pidof b/ctdb/tests/UNIT/eventscripts/stubs/pidof similarity index 100% rename from ctdb/tests/eventscripts/stubs/pidof rename to ctdb/tests/UNIT/eventscripts/stubs/pidof diff --git a/ctdb/tests/eventscripts/stubs/pkill b/ctdb/tests/UNIT/eventscripts/stubs/pkill similarity index 100% rename from ctdb/tests/eventscripts/stubs/pkill rename to ctdb/tests/UNIT/eventscripts/stubs/pkill diff --git a/ctdb/tests/eventscripts/stubs/ps b/ctdb/tests/UNIT/eventscripts/stubs/ps similarity index 100% rename from ctdb/tests/eventscripts/stubs/ps rename to ctdb/tests/UNIT/eventscripts/stubs/ps diff --git a/ctdb/tests/eventscripts/stubs/rm b/ctdb/tests/UNIT/eventscripts/stubs/rm similarity index 100% rename from ctdb/tests/eventscripts/stubs/rm rename to ctdb/tests/UNIT/eventscripts/stubs/rm diff --git a/ctdb/tests/eventscripts/stubs/rpc.lockd b/ctdb/tests/UNIT/eventscripts/stubs/rpc.lockd similarity index 100% rename from ctdb/tests/eventscripts/stubs/rpc.lockd rename to ctdb/tests/UNIT/eventscripts/stubs/rpc.lockd diff --git a/ctdb/tests/eventscripts/stubs/rpc.mountd b/ctdb/tests/UNIT/eventscripts/stubs/rpc.mountd similarity index 100% rename from ctdb/tests/eventscripts/stubs/rpc.mountd rename to ctdb/tests/UNIT/eventscripts/stubs/rpc.mountd diff --git a/ctdb/tests/eventscripts/stubs/rpc.rquotad b/ctdb/tests/UNIT/eventscripts/stubs/rpc.rquotad similarity index 100% rename from ctdb/tests/eventscripts/stubs/rpc.rquotad rename to ctdb/tests/UNIT/eventscripts/stubs/rpc.rquotad diff --git a/ctdb/tests/eventscripts/stubs/rpc.statd b/ctdb/tests/UNIT/eventscripts/stubs/rpc.statd similarity index 100% rename from ctdb/tests/eventscripts/stubs/rpc.statd rename to ctdb/tests/UNIT/eventscripts/stubs/rpc.statd diff --git a/ctdb/tests/eventscripts/stubs/rpcinfo b/ctdb/tests/UNIT/eventscripts/stubs/rpcinfo similarity index 100% rename from ctdb/tests/eventscripts/stubs/rpcinfo rename to ctdb/tests/UNIT/eventscripts/stubs/rpcinfo diff --git a/ctdb/tests/eventscripts/stubs/service b/ctdb/tests/UNIT/eventscripts/stubs/service similarity index 100% rename from ctdb/tests/eventscripts/stubs/service rename to ctdb/tests/UNIT/eventscripts/stubs/service diff --git a/ctdb/tests/eventscripts/stubs/sleep b/ctdb/tests/UNIT/eventscripts/stubs/sleep similarity index 100% rename from ctdb/tests/eventscripts/stubs/sleep rename to ctdb/tests/UNIT/eventscripts/stubs/sleep diff --git a/ctdb/tests/eventscripts/stubs/smnotify b/ctdb/tests/UNIT/eventscripts/stubs/smnotify similarity index 100% rename from ctdb/tests/eventscripts/stubs/smnotify rename to ctdb/tests/UNIT/eventscripts/stubs/smnotify diff --git a/ctdb/tests/eventscripts/stubs/ss b/ctdb/tests/UNIT/eventscripts/stubs/ss similarity index 100% rename from ctdb/tests/eventscripts/stubs/ss rename to ctdb/tests/UNIT/eventscripts/stubs/ss diff --git a/ctdb/tests/eventscripts/stubs/tdbdump b/ctdb/tests/UNIT/eventscripts/stubs/tdbdump similarity index 100% rename from ctdb/tests/eventscripts/stubs/tdbdump rename to ctdb/tests/UNIT/eventscripts/stubs/tdbdump diff --git a/ctdb/tests/eventscripts/stubs/tdbtool b/ctdb/tests/UNIT/eventscripts/stubs/tdbtool similarity index 100% rename from ctdb/tests/eventscripts/stubs/tdbtool rename to ctdb/tests/UNIT/eventscripts/stubs/tdbtool diff --git a/ctdb/tests/eventscripts/stubs/testparm b/ctdb/tests/UNIT/eventscripts/stubs/testparm similarity index 100% rename from ctdb/tests/eventscripts/stubs/testparm rename to ctdb/tests/UNIT/eventscripts/stubs/testparm diff --git a/ctdb/tests/eventscripts/stubs/timeout b/ctdb/tests/UNIT/eventscripts/stubs/timeout similarity index 100% rename from ctdb/tests/eventscripts/stubs/timeout rename to ctdb/tests/UNIT/eventscripts/stubs/timeout diff --git a/ctdb/tests/eventscripts/stubs/wbinfo b/ctdb/tests/UNIT/eventscripts/stubs/wbinfo similarity index 100% rename from ctdb/tests/eventscripts/stubs/wbinfo rename to ctdb/tests/UNIT/eventscripts/stubs/wbinfo diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh index ab0a37f3864..1f12dab9b27 100755 --- a/ctdb/tests/run_tests.sh +++ b/ctdb/tests/run_tests.sh @@ -305,7 +305,7 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts" unit_tests=" UNIT/cunit UNIT/eventd - eventscripts + UNIT/eventscripts onnode shellcheck takeover diff --git a/ctdb/wscript b/ctdb/wscript index c4251110c15..7e332b8625f 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -1051,7 +1051,6 @@ def build(bld): 'UNIT', 'complex', 'etc-ctdb', - 'eventscripts', 'onnode', 'shellcheck', 'simple',