From: Martin Schwenke <martin@meltin.net>
Date: Wed, 21 Mar 2018 03:48:12 +0000 (+1100)
Subject: ctdb-tests: Move variable FAKE_CTDB_IFACES_DOWN into ctdb stub
X-Git-Tag: talloc-2.1.13~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bbf3e97ca312cdc017c3173e734c85ac6e156db;p=thirdparty%2Fsamba.git

ctdb-tests: Move variable FAKE_CTDB_IFACES_DOWN into ctdb stub

It is the only user of this variable.

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

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 36de880bc4c..48fdf31bc6e 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -327,10 +327,6 @@ setup_ctdb ()
     export FAKE_CTDB_EXTRA_CONFIG="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-config.sh"
     rm -f "$FAKE_CTDB_EXTRA_CONFIG"
 
-    export FAKE_CTDB_IFACES_DOWN="$FAKE_CTDB_STATE/ifaces-down"
-    mkdir -p "$FAKE_CTDB_IFACES_DOWN"
-    rm -f "$FAKE_CTDB_IFACES_DOWN"/*
-
     export CTDB_PARTIALLY_ONLINE_INTERFACES
 
     export FAKE_CTDB_TUNABLES_OK="MonitorInterval TDBMutexEnabled DatabaseHashSize"
diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index b4965289a01..ad71b2738b7 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -405,6 +405,9 @@ EOF
 
 ######################################################################
 
+FAKE_CTDB_IFACES_DOWN="${FAKE_CTDB_STATE}/ifaces-down"
+rm -f "${FAKE_CTDB_IFACES_DOWN}"/*
+
 ctdb_ifaces()
 {
 	_f="${CTDB_BASE}/public_addresses"
@@ -436,6 +439,8 @@ ctdb_setifacelink ()
 	_iface="$1"
 	_state="$2"
 
+	mkdir -p "$FAKE_CTDB_IFACES_DOWN"
+
 	# Existence of file means CTDB thinks interface is down.
 	_f="${FAKE_CTDB_IFACES_DOWN}/${_iface}"