From: Martin Schwenke <martin@meltin.net>
Date: Thu, 8 Mar 2018 04:02:38 +0000 (+1100)
Subject: ctdb-tests: Use default public addresses file for event script tests
X-Git-Tag: talloc-2.1.12~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0aa735de1d2230aedec6ab7710d37290b227cc5;p=thirdparty%2Fsamba.git

ctdb-tests: Use default public addresses file for event script tests

Just use the default location in event script tests.

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

diff --git a/ctdb/tests/eventscripts/10.interface.init.001.sh b/ctdb/tests/eventscripts/10.interface.init.001.sh
index fae1a78d506..f29dd849fd9 100755
--- a/ctdb/tests/eventscripts/10.interface.init.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.001.sh
@@ -6,7 +6,7 @@ define_test "no public addresses"
 
 setup_ctdb
 
-export CTDB_PUBLIC_ADDRESSES="$CTDB_ETC/does/not/exist"
+rm -f "${CTDB_BASE}/public_addresses"
 
 ok "No public addresses file found. Nothing to do for 10.interfaces"
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.001.sh b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
index 42ef42d81b4..9f2939acee9 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
@@ -6,7 +6,7 @@ define_test "no public addresses"
 
 setup_ctdb
 
-export CTDB_PUBLIC_ADDRESSES="$CTDB_ETC/does/not/exist"
+rm -f "${CTDB_BASE}/public_addresses"
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/10.interface.startup.001.sh b/ctdb/tests/eventscripts/10.interface.startup.001.sh
index 42ef42d81b4..9f2939acee9 100755
--- a/ctdb/tests/eventscripts/10.interface.startup.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.001.sh
@@ -6,7 +6,7 @@ define_test "no public addresses"
 
 setup_ctdb
 
-export CTDB_PUBLIC_ADDRESSES="$CTDB_ETC/does/not/exist"
+rm -f "${CTDB_BASE}/public_addresses"
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index a09f5138971..c69668070c3 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -279,17 +279,10 @@ eventscript_call ()
 # it could be made more flexible.
 setup_public_addresses ()
 {
-    if [ -f "$CTDB_PUBLIC_ADDRESSES" -a \
-	    "${CTDB_PUBLIC_ADDRESSES%/*}" = "$EVENTSCRIPTS_TESTS_VAR_DIR" ] ; then
-	rm "$CTDB_PUBLIC_ADDRESSES"
-    fi
-
-    export CTDB_PUBLIC_ADDRESSES=$(mktemp \
-				       --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR" \
-				       "public-addresses-XXXXXXXX")
+	_f="${CTDB_BASE}/public_addresses"
 
-    echo "Setting up CTDB_PUBLIC_ADDRESSES=${CTDB_PUBLIC_ADDRESSES}"
-    cat >"$CTDB_PUBLIC_ADDRESSES" <<EOF
+	echo "Setting up public addresses in ${_f}"
+	cat >"$_f" <<EOF
 10.0.0.1/24 dev123
 10.0.0.2/24 dev123
 10.0.0.3/24 dev123
@@ -421,7 +414,7 @@ ctdb_get_1_interface ()
 # Each line is suitable for passing to takeip/releaseip
 ctdb_get_all_public_addresses ()
 {
-    _f="${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+    _f="${CTDB_BASE}/public_addresses"
     while IFS="/$IFS" read _ip _maskbits _ifaces ; do
 	echo "$_ifaces $_ip $_maskbits"
     done <"$_f"
@@ -441,7 +434,7 @@ ctdb_get_my_public_addresses ()
 		    echo $_iface $_ip $_maskbits
 		    break
 		fi
-	    done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+	    done <"${CTDB_BASE}/public_addresses"
 	done
     }
 }
diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index c304dde1c40..17a04767a7f 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -139,7 +139,7 @@ FAKE_CTDB_NODES_DISABLED="$FAKE_CTDB_NODE_STATE/0x4"
 
 ######################################################################
 
-# NOTE: all nodes share $CTDB_PUBLIC_ADDRESSES
+# NOTE: all nodes share public addresses file
 
 FAKE_CTDB_IP_LAYOUT="$FAKE_CTDB_STATE/ip-layout"
 
@@ -150,7 +150,7 @@ ip_reallocate ()
     (
 	flock 0
 
-	_pa="${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+	_pa="${CTDB_BASE}/public_addresses"
 
 	if [ ! -s "$FAKE_CTDB_IP_LAYOUT" ] ; then
 	    sed -n -e 's@^\([^#][^/]*\)/.*@\1 -1@p' \
@@ -201,7 +201,7 @@ ctdb_ip ()
 
     # Join public addresses file with $FAKE_CTDB_IP_LAYOUT, and
     # process output line by line...
-    _pa="${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+    _pa="${CTDB_BASE}/public_addresses"
     sed -e 's@/@ @' "$_pa" | sort | join - "$FAKE_CTDB_IP_LAYOUT" |
     while read _ip _bit _ifaces _pnn ; do
 	if $verbose ; then
@@ -418,7 +418,7 @@ case "$1" in
     ifaces)
 	# Assume -Y.
 	echo "|Name|LinkStatus|References|"
-	_f="${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+	_f="${CTDB_BASE}/public_addresses"
 	if [ -r "$_f" ] ; then
 	    while read _ip _iface ; do
 		case "_$ip" in