From: Martin Schwenke <martin@meltin.net>
Date: Wed, 2 May 2018 08:38:41 +0000 (+1000)
Subject: ctdb-tests: Clean up tests to not expose script options
X-Git-Tag: ldb-1.4.0~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60811d62e5cd37a7aece7d9c63c9434069e76365;p=thirdparty%2Fsamba.git

ctdb-tests: Clean up tests to not expose script options

The tests still use the script options but the event scripts no longer
see them exported from the test infrastructure.  Testing now depends
on the event scripts successfully fetching the options from the
configuration file.

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

diff --git a/ctdb/tests/eventscripts/scripts/01.reclock.sh b/ctdb/tests/eventscripts/scripts/01.reclock.sh
index 34f10a5a42a..a7094317a11 100644
--- a/ctdb/tests/eventscripts/scripts/01.reclock.sh
+++ b/ctdb/tests/eventscripts/scripts/01.reclock.sh
@@ -9,7 +9,7 @@ cleanup_reclock ()
 
 setup ()
 {
-	export CTDB_RECOVERY_LOCK="${EVENTSCRIPTS_TESTS_VAR_DIR}/rec.lock"
+	CTDB_RECOVERY_LOCK="${EVENTSCRIPTS_TESTS_VAR_DIR}/rec.lock"
 
 	cat >>"${CTDB_BASE}/ctdb.conf" <<EOF
 [cluster]
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index def4192d69c..d34135eba35 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -99,9 +99,9 @@ setup_script_options ()
 setup_dbdir ()
 {
 	export CTDB_DBDIR_BASE="${EVENTSCRIPTS_TESTS_VAR_DIR}/db"
-	export CTDB_DBDIR="${CTDB_DBDIR_BASE}/volatile"
-	export CTDB_DBDIR_PERSISTENT="${CTDB_DBDIR_BASE}/persistent"
-	export CTDB_DBDIR_STATE="${CTDB_DBDIR_BASE}/state"
+	CTDB_DBDIR="${CTDB_DBDIR_BASE}/volatile"
+	CTDB_DBDIR_PERSISTENT="${CTDB_DBDIR_BASE}/persistent"
+	CTDB_DBDIR_STATE="${CTDB_DBDIR_BASE}/state"
 	cat >>"${CTDB_BASE}/ctdb.conf" <<EOF
 [database]
 	volatile database directory = ${CTDB_DBDIR}