From: Martin Schwenke <martin@meltin.net>
Date: Fri, 6 Sep 2019 10:13:19 +0000 (+1000)
Subject: ctdb-tests: Switch eventscript unit tests to use CTDB_TEST_TMP_DIR
X-Git-Tag: talloc-2.3.1~730
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b16aa2016e499af96c4cbb3de4cb38515e86284;p=thirdparty%2Fsamba.git

ctdb-tests: Switch eventscript unit tests to use CTDB_TEST_TMP_DIR

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

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh b/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
index 809573d0936..7b1af3705aa 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
@@ -9,7 +9,7 @@ setup
 create_policy_routing_config 1 default
 
 _rt_tables="$CTDB_SYS_ETCDIR/iproute2/rt_tables"
-_rt_orig=$(TMPDIR="$EVENTSCRIPTS_TESTS_VAR_DIR" mktemp)
+_rt_orig=$(TMPDIR="$CTDB_TEST_TMP_DIR" mktemp)
 cp "$_rt_tables" "$_rt_orig"
 
 ctdb_get_1_public_address | {
diff --git a/ctdb/tests/eventscripts/scripts/01.reclock.sh b/ctdb/tests/eventscripts/scripts/01.reclock.sh
index 25c845f667b..cc1f086bb2c 100644
--- a/ctdb/tests/eventscripts/scripts/01.reclock.sh
+++ b/ctdb/tests/eventscripts/scripts/01.reclock.sh
@@ -3,7 +3,7 @@ setup ()
 	if [ $# -eq 1 ] ; then
 		reclock="$1"
 	else
-		reclock="${EVENTSCRIPTS_TESTS_VAR_DIR}/reclock_subdir/rec.lock"
+		reclock="${CTDB_TEST_TMP_DIR}/reclock_subdir/rec.lock"
 	fi
 	CTDB_RECOVERY_LOCK="$reclock"
 
diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/eventscripts/scripts/60.nfs.sh
index 195f7ffd780..59cdeda9b96 100644
--- a/ctdb/tests/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/eventscripts/scripts/60.nfs.sh
@@ -15,7 +15,7 @@ setup ()
 	setup_script_options <<EOF
 CTDB_NFS_SKIP_SHARE_CHECK="no"
 # This doesn't even need to exist
-CTDB_NFS_EXPORTS_FILE="$EVENTSCRIPTS_TESTS_VAR_DIR/etc-exports"
+CTDB_NFS_EXPORTS_FILE="${CTDB_TEST_TMP_DIR}/etc-exports"
 EOF
 
 	export RPCNFSDCOUNT
@@ -112,7 +112,7 @@ nfs_setup_fake_threads ()
 
 	case "$_prog" in
 	nfsd)
-		export PROCFS_PATH="${EVENTSCRIPTS_TESTS_VAR_DIR}/proc"
+		export PROCFS_PATH="${CTDB_TEST_TMP_DIR}/proc"
 		_threads="${PROCFS_PATH}/fs/nfsd/threads"
 		mkdir -p $(dirname "$_threads")
 		echo $# >"$_threads"
@@ -232,9 +232,9 @@ rpc_set_service_failure_response ()
 	[ -r "$_file" ] || \
 		die "RPC check file \"$_file\" does not exist or is not unique"
 
-	_out="${EVENTSCRIPTS_TESTS_VAR_DIR}/rpc_failure_output"
+	_out="${CTDB_TEST_TMP_DIR}/rpc_failure_output"
 	: >"$_out"
-	_rc_file="${EVENTSCRIPTS_TESTS_VAR_DIR}/rpc_result"
+	_rc_file="${CTDB_TEST_TMP_DIR}/rpc_result"
 
 	(
 		# Subshell to restrict scope variables...
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 16eeafd1050..e1b92b41fbe 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -21,37 +21,30 @@ PATH="${stubs_dir}:${PATH}"
 
 export CTDB="ctdb"
 
-[ -n "$TEST_VAR_DIR" ] || die "TEST_VAR_DIR unset"
-export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_eventscripts"
-if [ -d "$EVENTSCRIPTS_TESTS_VAR_DIR" ] ; then
-	rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
-fi
-mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR"
-
 # Force this to be absolute - event scripts can change directory
-EVENTSCRIPTS_TESTS_VAR_DIR=$(cd "$EVENTSCRIPTS_TESTS_VAR_DIR" && echo "$PWD")
+CTDB_TEST_TMP_DIR=$(cd "$CTDB_TEST_TMP_DIR" && echo "$PWD")
 
-export CTDB_LOGGING="file:${EVENTSCRIPTS_TESTS_VAR_DIR}/log.ctdb"
+export CTDB_LOGGING="file:${CTDB_TEST_TMP_DIR}/log.ctdb"
 touch "${CTDB_LOGGING#file:}" || \
     die "Unable to setup logging for \"$CTDB_LOGGING\""
 
 if [ -d "${CTDB_TEST_SUITE_DIR}/etc" ] ; then
-    cp -a "${CTDB_TEST_SUITE_DIR}/etc" "$EVENTSCRIPTS_TESTS_VAR_DIR"
-    export CTDB_SYS_ETCDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/etc"
+    cp -a "${CTDB_TEST_SUITE_DIR}/etc" "$CTDB_TEST_TMP_DIR"
+    export CTDB_SYS_ETCDIR="${CTDB_TEST_TMP_DIR}/etc"
 else
     die "Unable to setup \$CTDB_SYS_ETCDIR"
 fi
 
-setup_ctdb_base "$EVENTSCRIPTS_TESTS_VAR_DIR" "etc-ctdb" \
+setup_ctdb_base "$CTDB_TEST_TMP_DIR" "etc-ctdb" \
 		functions \
 		nfs-checks.d \
 		nfs-linux-kernel-callout \
 		statd-callout
 
-export FAKE_CTDB_STATE="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-ctdb"
+export FAKE_CTDB_STATE="${CTDB_TEST_TMP_DIR}/fake-ctdb"
 mkdir -p "$FAKE_CTDB_STATE"
 
-export FAKE_NETWORK_STATE="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-network-state"
+export FAKE_NETWORK_STATE="${CTDB_TEST_TMP_DIR}/fake-network-state"
 mkdir -p "$FAKE_NETWORK_STATE"
 
 ######################################################################
@@ -100,7 +93,7 @@ setup_script_options ()
 
 setup_dbdir ()
 {
-	export CTDB_DBDIR_BASE="${EVENTSCRIPTS_TESTS_VAR_DIR}/db"
+	export CTDB_DBDIR_BASE="${CTDB_TEST_TMP_DIR}/db"
 	CTDB_DBDIR="${CTDB_DBDIR_BASE}/volatile"
 	CTDB_DBDIR_PERSISTENT="${CTDB_DBDIR_BASE}/persistent"
 	CTDB_DBDIR_STATE="${CTDB_DBDIR_BASE}/state"
@@ -166,7 +159,7 @@ setup_shares ()
 	# Create 3 fake shares/exports.
 	export FAKE_SHARES=""
 	for i in $(seq 1 3) ; do
-		_s="${EVENTSCRIPTS_TESTS_VAR_DIR}/shares/share${i}"
+		_s="${CTDB_TEST_TMP_DIR}/shares/share${i}"
 		mkdir -p "$_s"
 		FAKE_SHARES="${FAKE_SHARES}${FAKE_SHARES:+ }${_s}"
 	done
@@ -311,7 +304,7 @@ ctdb_set_pnn ()
     export FAKE_CTDB_PNN="$1"
     echo "Setting up PNN ${FAKE_CTDB_PNN}"
 
-    CTDB_SCRIPT_VARDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/scripts/${FAKE_CTDB_PNN}"
+    CTDB_SCRIPT_VARDIR="${CTDB_TEST_TMP_DIR}/scripts/${FAKE_CTDB_PNN}"
     export CTDB_SCRIPT_VARDIR
     mkdir -p "$CTDB_SCRIPT_VARDIR"
 }
diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index c3ea0d50550..12627de16a5 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -60,7 +60,7 @@ set -- $args
 setup_tickles ()
 {
     # Make sure tickles file exists.
-    tickles_file="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-ctdb/tickles"
+    tickles_file="${CTDB_TEST_TMP_DIR}/fake-ctdb/tickles"
     mkdir -p $(dirname "$tickles_file")
     touch "$tickles_file"
 }
@@ -330,7 +330,7 @@ ctdb_setvar ()
 
 _t_setup ()
 {
-    _t_dir="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-ctdb/fake-tdb/$1"
+    _t_dir="${CTDB_TEST_TMP_DIR}/fake-ctdb/fake-tdb/$1"
     mkdir -p "$_t_dir"
 }
 
diff --git a/ctdb/tests/eventscripts/stubs/service b/ctdb/tests/eventscripts/stubs/service
index 5f47b55e003..3d6ddf4ba68 100755
--- a/ctdb/tests/eventscripts/stubs/service
+++ b/ctdb/tests/eventscripts/stubs/service
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-service_status_dir="${EVENTSCRIPTS_TESTS_VAR_DIR}/service_fake_status"
+service_status_dir="${CTDB_TEST_TMP_DIR}/service_fake_status"
 mkdir -p "$service_status_dir"
 
 service="$1"