From: Martin Schwenke <martin@meltin.net>
Date: Wed, 14 Mar 2018 04:08:44 +0000 (+1100)
Subject: ctdb-tests: Put configuration, socket and PID file in CTDB_BASE
X-Git-Tag: talloc-2.1.12~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a7c49dfbc9ce579876d5cd680ede1f30c11c950;p=thirdparty%2Fsamba.git

ctdb-tests: Put configuration, socket and PID file in CTDB_BASE

setup_ctdb_base() makes this a convenient temporary directory.

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

diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh
index a419552cb34..42eabd16fe3 100644
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -11,8 +11,8 @@ else
     debug () { : ; }
 fi
 
-ctdbd_socket="${TEST_VAR_DIR}/ctdbd.socket.$$"
-ctdbd_pidfile="${TEST_VAR_DIR}/ctdbd.pid.$$"
+ctdbd_socket="${CTDB_BASE}/ctdbd.socket"
+ctdbd_pidfile="${CTDB_BASE}/ctdbd.pid"
 
 define_test ()
 {
@@ -73,12 +73,7 @@ setup_natgw ()
 	debug "Setting up NAT gateway"
 
 	export CTDB_NATGW_HELPER="${CTDB_SCRIPTS_TOOLS_HELPER_DIR}/ctdb_natgw"
-
-	natgw_config_dir="${TEST_VAR_DIR}/natgw_config"
-	mkdir -p "$natgw_config_dir"
-
-	export CTDB_NATGW_NODES=$(mktemp --tmpdir="$natgw_config_dir")
-	test_cleanup "rm -f $CTDB_NATGW_NODES"
+	export CTDB_NATGW_NODES="${CTDB_BASE}/natgw_nodes"
 
 	cat >"$CTDB_NATGW_NODES"
 }
@@ -88,12 +83,7 @@ setup_lvs ()
 	debug "Setting up LVS"
 
 	export CTDB_LVS_HELPER="${CTDB_SCRIPTS_TOOLS_HELPER_DIR}/ctdb_lvs"
-
-	lvs_config_dir="${TEST_VAR_DIR}/lvs_config"
-	mkdir -p "$lvs_config_dir"
-
-	export CTDB_LVS_NODES=$(mktemp --tmpdir="$lvs_config_dir")
-	test_cleanup "rm -f ${CTDB_LVS_NODES}"
+	export CTDB_LVS_NODES="${CTDB_BASE}/lvs_nodes"
 
 	cat >"$CTDB_LVS_NODES"
 }