ctdb-tests: Ensure some event scripts are enabled for cluster tests

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

diff --git a/ctdb/tests/complex/00_ctdb_init.sh b/ctdb/tests/complex/00_ctdb_init.sh
new file mode 100755 (executable)
index 0000000..f4905e8
--- /dev/null
+++ b/ctdb/tests/complex/00_ctdb_init.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+test_info()
+{
+    cat <<EOF
+Restart the ctdbd daemons of a CTDB cluster.
+
+Ensure that event script reequired for cluster tests are enabled.
+EOF
+}
+
+. "${TEST_SCRIPTS_DIR}/integration.bash"
+
+ctdb_test_init "$@"
+
+set -e
+
+ctdb_test_check_real_cluster
+
+ctdb_stop_all >/dev/null 2>&1 || true
+
+ctdb_enable_cluster_test_event_scripts
+
+ctdb_start_all

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 96762813b74736d68c6db1abf5d5df248dfd36da..c3c573c96223bf4c26517b15e438eabdda02f9c7 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -735,6 +735,26 @@ db_ctdb_tstore_dbseqnum ()
 
 #######################################
 
+# Enables all of the event scripts used in cluster tests, except for
+# the mandatory scripts
+ctdb_enable_cluster_test_event_scripts ()
+{
+       local scripts="
+                      06.nfs
+                      10.interface
+                      49.winbind
+                      50.samba
+                      60.nfs
+                     "
+
+       local s
+       for s in $scripts ; do
+               try_command_on_node all ctdb event script enable legacy "$s"
+       done
+}
+
+########################################
+
 # Make sure that $CTDB is set.
 : ${CTDB:=ctdb}
 

diff --git a/ctdb/tests/simple/00_ctdb_init.sh b/ctdb/tests/simple/00_ctdb_init.sh
index 66b42ddc561ff33e12d723b3995e03bbcb606e66..26b2615a0bfcb1bc4af57ce3db2689b3fc9dd632 100755 (executable)
--- a/ctdb/tests/simple/00_ctdb_init.sh
+++ b/ctdb/tests/simple/00_ctdb_init.sh
@@ -30,6 +30,10 @@ set -e
 
 ctdb_stop_all >/dev/null 2>&1 || true
 
+if [ -z "$TEST_LOCAL_DAEMONS" ] ; then
+       ctdb_enable_cluster_test_event_scripts
+fi
+
 setup_ctdb
 
 ctdb_start_all