ctdb-tests: Move enabling of event scripts to setup_ctdb()

This is for the real cluster case.

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
index 41eeac05b68b212dce572e1ef156f7d147b978b1..d45166ae798a4c15ca72d94ef4fc0b6442da41ed 100755 (executable)
--- a/ctdb/tests/complex/00_ctdb_init.sh
+++ b/ctdb/tests/complex/00_ctdb_init.sh
@@ -19,6 +19,4 @@ ctdb_test_check_real_cluster
 
 ctdb_stop_all >/dev/null 2>&1 || true
 
-ctdb_enable_cluster_test_event_scripts
-
 ctdb_init

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index fdfa714fe87e499d6a30f76a960fb04fc219dce0..4202829f2cc1f45faf392bf5ecb376e3c7590a8d 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -507,10 +507,9 @@ ctdb_start_all ()
        onnode -p all $CTDB_TEST_WRAPPER _service_ctdb start
 }
 
-# Nothing needed for a cluster.  Override for local daemons.
 setup_ctdb ()
 {
-    :
+       ctdb_enable_cluster_test_event_scripts
 }
 
 start_ctdb_1 ()

diff --git a/ctdb/tests/simple/00_ctdb_init.sh b/ctdb/tests/simple/00_ctdb_init.sh
index 9c3d374a0f246c007ac39813472ca7c7f1cf35bf..99eb7298431eb2e22469121d390c0c0a49395f22 100755 (executable)
--- a/ctdb/tests/simple/00_ctdb_init.sh
+++ b/ctdb/tests/simple/00_ctdb_init.sh
@@ -30,10 +30,6 @@ 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_init