From: Martin Schwenke <martin@meltin.net>
Date: Tue, 9 Oct 2018 04:09:38 +0000 (+1100)
Subject: ctdb-tests: Move enabling of event scripts to setup_ctdb()
X-Git-Tag: tdb-1.3.17~884
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=412fb7b7d50db0ec5b68e849fc08bcb58de038d1;p=thirdparty%2Fsamba.git

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 41eeac05b68..d45166ae798 100755
--- 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 fdfa714fe87..4202829f2cc 100644
--- 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 9c3d374a0f2..99eb7298431 100755
--- 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