tests/eventscripts - Restructure according to new convention

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit eb13507713ba6732271b7c3024bfddbda6da5ffc)

ctdb/tests/eventscripts/10.interface.init.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "no public addresses"
 

ctdb/tests/eventscripts/10.interface.init.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up"
 

ctdb/tests/eventscripts/10.interface.monitor.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "no public addresses"
 

ctdb/tests/eventscripts/10.interface.monitor.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up"
 

ctdb/tests/eventscripts/10.interface.monitor.003.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 interface down"
 

ctdb/tests/eventscripts/10.interface.monitor.004.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up, 1 is a bond"
 

ctdb/tests/eventscripts/10.interface.monitor.005.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 bond, no active slaves"
 

ctdb/tests/eventscripts/10.interface.monitor.006.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 bond, active slaves, link down"
 

ctdb/tests/eventscripts/10.interface.monitor.007.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "unknown interface, up"
 

ctdb/tests/eventscripts/10.interface.monitor.008.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "unknown interface, down, up"
 

ctdb/tests/eventscripts/10.interface.monitor.009.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 down"
 

ctdb/tests/eventscripts/10.interface.monitor.010.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, all down"
 

ctdb/tests/eventscripts/10.interface.monitor.011.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 

ctdb/tests/eventscripts/10.interface.monitor.012.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 

ctdb/tests/eventscripts/10.interface.monitor.013.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 bond, active slaves, link down"
 

ctdb/tests/eventscripts/10.interface.monitor.014.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "spurious addresses on interface, no action"
 

ctdb/tests/eventscripts/10.interface.monitor.015.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "spurious addresses on interface, delete them"
 

ctdb/tests/eventscripts/10.interface.multi.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, removeip"
 

ctdb/tests/eventscripts/10.interface.releaseip.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - no args given"
 

ctdb/tests/eventscripts/10.interface.releaseip.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - remove a non-existent ip"
 

ctdb/tests/eventscripts/10.interface.startup.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "no public addresses"
 

ctdb/tests/eventscripts/10.interface.startup.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up"
 

ctdb/tests/eventscripts/10.interface.takeip.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - no args given"
 

ctdb/tests/eventscripts/10.interface.takeip.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "add an ip"
 

ctdb/tests/eventscripts/10.interface.takeip.003.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - add same IP twice"
 

ctdb/tests/eventscripts/13.per_ip_routing.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not configured"
 

ctdb/tests/eventscripts/13.per_ip_routing.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "missing config, no takeip, ipreallocated"
 

ctdb/tests/eventscripts/13.per_ip_routing.003.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "empty config, ipreallocated"
 

ctdb/tests/eventscripts/13.per_ip_routing.004.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "empty config, takeip"
 

ctdb/tests/eventscripts/13.per_ip_routing.005.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip"
 

ctdb/tests/eventscripts/13.per_ip_routing.006.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip, releaseip"
 

ctdb/tests/eventscripts/13.per_ip_routing.007.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, ipreallocated"
 

ctdb/tests/eventscripts/13.per_ip_routing.008.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip twice"
 

ctdb/tests/eventscripts/13.per_ip_routing.009.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "All IPs configured, takeip"
 

ctdb/tests/eventscripts/13.per_ip_routing.010.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "All IPs configured, takeip all on node"
 

ctdb/tests/eventscripts/13.per_ip_routing.011.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "__auto_link_local__, takeip all on node"
 

ctdb/tests/eventscripts/13.per_ip_routing.012.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip, releaseip, ipreallocated"
 

ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 

ctdb/tests/eventscripts/41.httpd.monitor.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 

ctdb/tests/eventscripts/50.samba.monitor.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 

ctdb/tests/eventscripts/50.samba.monitor.050.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "auto-start, simple"
 

ctdb/tests/eventscripts/50.samba.monitor.051.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "auto-stop, simple"
 

ctdb/tests/eventscripts/50.samba.monitor.101.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all OK"
 

ctdb/tests/eventscripts/50.samba.monitor.102.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "winbind down"
 

ctdb/tests/eventscripts/50.samba.monitor.103.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 445 down"
 

ctdb/tests/eventscripts/50.samba.monitor.104.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down"
 

ctdb/tests/eventscripts/50.samba.monitor.105.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "non-existent share path"
 

ctdb/tests/eventscripts/50.samba.monitor.106.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "non-existent share - not checked"
 

ctdb/tests/eventscripts/50.samba.monitor.107.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, default tcp checker, debug"
 

ctdb/tests/eventscripts/50.samba.monitor.108.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport not implemented"
 

ctdb/tests/eventscripts/50.samba.monitor.109.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport not implemented, debug"
 

ctdb/tests/eventscripts/50.samba.monitor.110.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport/nmap not implemented, debug"
 

ctdb/tests/eventscripts/50.samba.monitor.111.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport/nmap/netstat not implemented"
 

ctdb/tests/eventscripts/60.nfs.monitor.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 

ctdb/tests/eventscripts/60.nfs.monitor.100.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "get RPC service fail limits/actions"
 

ctdb/tests/eventscripts/60.nfs.monitor.101.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all services available"
 

ctdb/tests/eventscripts/60.nfs.monitor.111.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "knfsd down, 1 iteration"
 

ctdb/tests/eventscripts/60.nfs.monitor.112.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "knfsd down, 6 iterations"
 

ctdb/tests/eventscripts/60.nfs.monitor.121.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "lockd down, 15 iterations"
 

ctdb/tests/eventscripts/60.nfs.monitor.122.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "lockd down, 15 iterations, back up after 10"
 

ctdb/tests/eventscripts/60.nfs.monitor.131.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "rquotad down, 5 iterations"
 

ctdb/tests/eventscripts/60.nfs.monitor.132.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "rquotad down, 5 iterations, back up after 1"
 

ctdb/tests/eventscripts/60.nfs.monitor.141.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "statd down, 6 iterations"
 

ctdb/tests/eventscripts/60.nfs.monitor.142.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "statd down, 8 iterations, back up after 2"
 

ctdb/tests/eventscripts/60.nfs.monitor.151.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "mountd down, 1 iteration"
 

ctdb/tests/eventscripts/60.nfs.monitor.152.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "mountd down, 10 iterations"
 

ctdb/tests/eventscripts/60.nfs.monitor.153.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "mountd down, 10 iterations, back up after 5"
 

ctdb/tests/eventscripts/60.nfs.monitor.161.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "2nd share missing"
 

ctdb/tests/eventscripts/60.nfs.monitor.162.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "2nd share missing, skipping share checks"
 

ctdb/tests/eventscripts/60.nfs.multi.001.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, ipreallocated -> reconfigure"
 

ctdb/tests/eventscripts/60.nfs.multi.002.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure"
 

ctdb/tests/eventscripts/60.nfs.multi.003.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure, replay error"
 

ctdb/tests/eventscripts/60.nfs.multi.004.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure, replay timedout"
 

ctdb/tests/eventscripts/60.nfs.multi.005.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure, replay disabled"
 

ctdb/tests/eventscripts/60.nfs.multi.006.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "reconfigure (synthetic), twice"
 # This checks that the lock is released...

ctdb/tests/eventscripts/scripts/local.sh

@@ -1,8 +1,5 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-# Print a message and exit.
-die () { echo "$@" >&2 ; exit 1 ; }
-
 # Augment PATH with relevant stubs/ directories.  We do this by actually
 # setting PATH, and also by setting $EVENTSCRIPTS_PATH and then
 # prepending that to $PATH in rc.local to avoid the PATH reset in
@@ -10,45 +7,29 @@ die () { echo "$@" >&2 ; exit 1 ; }
 
 EVENTSCRIPTS_PATH=""
 
-if [ -d "${EVENTSCRIPTS_TESTS_DIR}/stubs" ] ; then
-    EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTS_DIR}/stubs"
-fi
-
-export EVENTSCRIPTS_TESTCASE_DIR=$(dirname "$0")
-if [ $(basename "$EVENTSCRIPTS_TESTCASE_DIR") = "eventscripts" ] ; then
-    # Just a test script, no testcase subdirectory.
-    EVENTSCRIPTS_TESTCASE_DIR="$EVENTSCRIPTS_TESTS_DIR"
-else
-    if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/stubs" ] ; then
-	EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTCASE_DIR}/stubs:${EVENTSCRIPTS_PATH}"
-    fi
+if [ -d "${TEST_SUBDIR}/stubs" ] ; then
+    EVENTSCRIPTS_PATH="${TEST_SUBDIR}/stubs"
 fi
 
 export EVENTSCRIPTS_PATH
 
 PATH="${EVENTSCRIPTS_PATH}:${PATH}"
 
-if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/etc" ] ; then
-    CTDB_ETCDIR="${EVENTSCRIPTS_TESTCASE_DIR}/etc"
-elif [ -d "${EVENTSCRIPTS_TESTS_DIR}/etc" ] ; then
-    CTDB_ETCDIR="${EVENTSCRIPTS_TESTS_DIR}/etc"
+if [ -d "${TEST_SUBDIR}/etc" ] ; then
+    CTDB_ETCDIR="${TEST_SUBDIR}/etc"
 else
     die "Unable to set \$CTDB_ETCDIR"
 fi
 export CTDB_ETCDIR
 
-if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/etc-ctdb" ] ; then
-    CTDB_BASE="${EVENTSCRIPTS_TESTCASE_DIR}/etc-ctdb"
-elif [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/etc/ctdb" ] ; then
-    CTDB_BASE="${EVENTSCRIPTS_TESTCASE_DIR}/etc/ctdb"
-elif [ -d "${EVENTSCRIPTS_TESTS_DIR}/etc-ctdb" ] ; then
-    CTDB_BASE="${EVENTSCRIPTS_TESTS_DIR}/etc-ctdb"
+if [ -d "${TEST_SUBDIR}/etc-ctdb" ] ; then
+    CTDB_BASE="${TEST_SUBDIR}/etc-ctdb"
 else
     die "Unable to set \$CTDB_BASE"
 fi
 export CTDB_BASE
 
-export EVENTSCRIPTS_TESTS_VAR_DIR="${EVENTSCRIPTS_TESTS_DIR}/var"
+export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_SUBDIR}/var"
 if [ "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/var" ] ; then
     rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
 fi
@@ -57,7 +38,7 @@ export CTDB_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/ctdb"
 
 ######################################################################
 
-if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] ; then
+if [ "$TEST_VERBOSE" = "yes" ] ; then
     debug () { echo "$@" ; }
 else
     debug () { : ; }
@@ -665,12 +646,7 @@ define_test ()
 {
     desc="$1"
 
-    _f="$0"
-    _f="${_f#./}"          # strip leading ./
-    _f="${_f#simple/}"     # strip leading simple/
-    _f="${_f#multievent/}" # strip leading multievent/
-    _f="${_f%%/*}"         # if subdir, strip off file
-    _f="${_f%.sh}"         # strip off .sh suffix if any
+    _f=$(basename "$0" ".sh")
 
     # Remaining format should be NN.service.event.NNN or NN.service.NNN:
     _num="${_f##*.}"
@@ -779,7 +755,7 @@ result_footer ()
 {
     _passed="$1"
 
-    if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] || ! $_passed ; then
+    if [ "$TEST_VERBOSE" = "yes" ] || ! $_passed ; then
 
 	cat <<EOF
 --------------------------------------------------

ctdb/tests/eventscripts/stubs/ctdb

@@ -126,7 +126,7 @@ ip_reallocate ()
 	    fi
 	    _flags="${_flags}${_flags:+,}${_this}"
 	done
-	"$(dirname ${EVENTSCRIPTS_TESTS_DIR})/bin/ctdb_takeover_tests" \
+	"$(dirname ${TEST_SUBDIR})/bin/ctdb_takeover_tests" \
 	    "ctdb_takeover_run_core" "$_flags" <"$FAKE_CTDB_IP_LAYOUT" |
 	    sort >"$_t"
 	mv "$_t" "$FAKE_CTDB_IP_LAYOUT"