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 36de880bc4cdf5f617e51ab3a5d702be38546d58..48fdf31bc6efb2ea4fc1812baf06f8985e57a7d5 100644 (file)
--- 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 b4965289a011b5ba10042c67d25d639a60262779..ad71b2738b75e4a39f1accc03c0e327d59e50f5e 100755 (executable)
--- 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}"