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

ctdb-tests: Switch cunit 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/cunit/cluster_mutex_001.sh b/ctdb/tests/cunit/cluster_mutex_001.sh
index feb78f3efa8..eaa7b2d5b1c 100755
--- a/ctdb/tests/cunit/cluster_mutex_001.sh
+++ b/ctdb/tests/cunit/cluster_mutex_001.sh
@@ -7,7 +7,7 @@
 t="${CTDB_SCRIPTS_HELPER_BINDIR}/ctdb_mutex_fcntl_helper"
 export CTDB_CLUSTER_MUTEX_HELPER="$t"
 
-lockfile="${TEST_VAR_DIR}/cluster_mutex.lockfile"
+lockfile="${CTDB_TEST_TMP_DIR}/cluster_mutex.lockfile"
 trap 'rm -f ${lockfile}' 0
 
 ok <<EOF
diff --git a/ctdb/tests/cunit/cluster_mutex_002.sh b/ctdb/tests/cunit/cluster_mutex_002.sh
index 97fbbfc24d3..c36a9f583a9 100755
--- a/ctdb/tests/cunit/cluster_mutex_002.sh
+++ b/ctdb/tests/cunit/cluster_mutex_002.sh
@@ -6,7 +6,7 @@
 
 export CTDB_CLUSTER_MUTEX_HELPER="/bin/false"
 
-lockfile="${TEST_VAR_DIR}/cluster_mutex.lockfile"
+lockfile="${CTDB_TEST_TMP_DIR}/cluster_mutex.lockfile"
 trap 'rm ${lockfile}' 0
 
 t="${CTDB_SCRIPTS_HELPER_BINDIR}/ctdb_mutex_fcntl_helper"
diff --git a/ctdb/tests/cunit/cluster_mutex_003.sh b/ctdb/tests/cunit/cluster_mutex_003.sh
index 5f351d9e9e1..e4f95c1f509 100755
--- a/ctdb/tests/cunit/cluster_mutex_003.sh
+++ b/ctdb/tests/cunit/cluster_mutex_003.sh
@@ -9,7 +9,7 @@
 
 export CTDB_CLUSTER_MUTEX_HELPER="/bin/false"
 
-lockfile="${TEST_VAR_DIR}/cluster_mutex.lockfile"
+lockfile="${CTDB_TEST_TMP_DIR}/cluster_mutex.lockfile"
 trap 'rm ${lockfile}' 0
 
 if [ -n "$CTDB_TEST_MUTEX_HELPER" ] ; then
diff --git a/ctdb/tests/cunit/comm_test_002.sh b/ctdb/tests/cunit/comm_test_002.sh
index 76ee62d1a24..a2fbf5189be 100755
--- a/ctdb/tests/cunit/comm_test_002.sh
+++ b/ctdb/tests/cunit/comm_test_002.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-socket="${TEST_VAR_DIR}/test_sock.$$"
+socket="${CTDB_TEST_TMP_DIR}/test_sock.$$"
 num_clients=10
 
 remove_socket ()
diff --git a/ctdb/tests/cunit/conf_test_001.sh b/ctdb/tests/cunit/conf_test_001.sh
index bad1c1d2c78..188964e41f6 100755
--- a/ctdb/tests/cunit/conf_test_001.sh
+++ b/ctdb/tests/cunit/conf_test_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-conffile="${TEST_VAR_DIR}/config.$$"
+conffile="${CTDB_TEST_TMP_DIR}/config.$$"
 
 remove_files ()
 {
diff --git a/ctdb/tests/cunit/config_test_001.sh b/ctdb/tests/cunit/config_test_001.sh
index d213aa88bfd..9a8682b04e6 100755
--- a/ctdb/tests/cunit/config_test_001.sh
+++ b/ctdb/tests/cunit/config_test_001.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="${CTDB_BASE}/ctdb.conf"
 
diff --git a/ctdb/tests/cunit/config_test_002.sh b/ctdb/tests/cunit/config_test_002.sh
index 6491fa811a1..ad6d381d4ed 100755
--- a/ctdb/tests/cunit/config_test_002.sh
+++ b/ctdb/tests/cunit/config_test_002.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="${CTDB_BASE}/ctdb.conf"
 
diff --git a/ctdb/tests/cunit/config_test_003.sh b/ctdb/tests/cunit/config_test_003.sh
index 28b06226866..4e8d55397c0 100755
--- a/ctdb/tests/cunit/config_test_003.sh
+++ b/ctdb/tests/cunit/config_test_003.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="${CTDB_BASE}/ctdb.conf"
 scriptfile="${CTDB_BASE}/debug-hung-script.sh"
diff --git a/ctdb/tests/cunit/config_test_004.sh b/ctdb/tests/cunit/config_test_004.sh
index 4578bdb543c..10a36567dac 100755
--- a/ctdb/tests/cunit/config_test_004.sh
+++ b/ctdb/tests/cunit/config_test_004.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="$CTDB_BASE/ctdb.conf"
 
diff --git a/ctdb/tests/cunit/config_test_005.sh b/ctdb/tests/cunit/config_test_005.sh
index cd48a84a78a..c16a43f8265 100755
--- a/ctdb/tests/cunit/config_test_005.sh
+++ b/ctdb/tests/cunit/config_test_005.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_HELPER_BINDIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="${CTDB_BASE}/ctdb.conf"
 scriptfile="${CTDB_BASE}/debug_locks.sh"
diff --git a/ctdb/tests/cunit/config_test_006.sh b/ctdb/tests/cunit/config_test_006.sh
index d367cd48c2e..11b23fce0e5 100755
--- a/ctdb/tests/cunit/config_test_006.sh
+++ b/ctdb/tests/cunit/config_test_006.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_HELPER_BINDIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="${CTDB_BASE}/ctdb.conf"
 
diff --git a/ctdb/tests/cunit/config_test_007.sh b/ctdb/tests/cunit/config_test_007.sh
index adffeb7b1ca..8804448af89 100755
--- a/ctdb/tests/cunit/config_test_007.sh
+++ b/ctdb/tests/cunit/config_test_007.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_HELPER_BINDIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 conffile="${CTDB_BASE}/ctdb.conf"
 
diff --git a/ctdb/tests/cunit/event_script_test_001.sh b/ctdb/tests/cunit/event_script_test_001.sh
index 0ef93653dc7..0d6a38e9dea 100755
--- a/ctdb/tests/cunit/event_script_test_001.sh
+++ b/ctdb/tests/cunit/event_script_test_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-scriptdir="${TEST_VAR_DIR}/cunit/scriptdir"
+scriptdir="${CTDB_TEST_TMP_DIR}/scriptdir"
 mkdir -p "${scriptdir}"
 
 scriptdir=$(cd "$scriptdir" && echo "$PWD")
diff --git a/ctdb/tests/cunit/line_test_001.sh b/ctdb/tests/cunit/line_test_001.sh
index 991d01a24e7..5676893ba17 100755
--- a/ctdb/tests/cunit/line_test_001.sh
+++ b/ctdb/tests/cunit/line_test_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-tfile="${TEST_VAR_DIR}/line.$$"
+tfile="${CTDB_TEST_TMP_DIR}/line.$$"
 
 remove_files ()
 {
diff --git a/ctdb/tests/cunit/path_tests_001.sh b/ctdb/tests/cunit/path_tests_001.sh
index 7b2ff129b71..5713fc88bae 100755
--- a/ctdb/tests/cunit/path_tests_001.sh
+++ b/ctdb/tests/cunit/path_tests_001.sh
@@ -4,7 +4,7 @@
 
 PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
 
-setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+setup_ctdb_base "${CTDB_TEST_TMP_DIR}" "ctdb-etc"
 
 ok <<EOF
 $CTDB_BASE/ctdb.conf
diff --git a/ctdb/tests/cunit/pidfile_test_001.sh b/ctdb/tests/cunit/pidfile_test_001.sh
index fb80d62cf6f..cf484039cbf 100755
--- a/ctdb/tests/cunit/pidfile_test_001.sh
+++ b/ctdb/tests/cunit/pidfile_test_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-pidfile=$(TMPDIR="$TEST_VAR_DIR" mktemp)
+pidfile=$(TMPDIR="$CTDB_TEST_TMP_DIR" mktemp)
 
 ok_null
 unit_test pidfile_test $pidfile
diff --git a/ctdb/tests/cunit/porting_tests_001.sh b/ctdb/tests/cunit/porting_tests_001.sh
index 45ae6194610..52291b20cc6 100755
--- a/ctdb/tests/cunit/porting_tests_001.sh
+++ b/ctdb/tests/cunit/porting_tests_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-socket="${TEST_VAR_DIR}/test_sock.$$"
+socket="${CTDB_TEST_TMP_DIR}/test_sock.$$"
 
 remove_socket ()
 {
diff --git a/ctdb/tests/cunit/run_event_001.sh b/ctdb/tests/cunit/run_event_001.sh
index 75c51111b14..50051bfaab2 100755
--- a/ctdb/tests/cunit/run_event_001.sh
+++ b/ctdb/tests/cunit/run_event_001.sh
@@ -8,7 +8,7 @@ run_event_init() failed, ret=2
 EOF
 unit_test run_event_test /a/b/c list
 
-scriptdir=$(TMPDIR="$TEST_VAR_DIR" mktemp -d)
+scriptdir=$(TMPDIR="$CTDB_TEST_TMP_DIR" mktemp -d)
 
 # Empty directory
 ok <<EOF
diff --git a/ctdb/tests/cunit/run_proc_001.sh b/ctdb/tests/cunit/run_proc_001.sh
index ac0c0da6ca4..3f48885298d 100755
--- a/ctdb/tests/cunit/run_proc_001.sh
+++ b/ctdb/tests/cunit/run_proc_001.sh
@@ -9,7 +9,7 @@ EOF
 unit_test run_proc_test 0 -1 /a/b/c
 
 # Non-executable path
-prog=$(TMPDIR="$TEST_VAR_DIR" mktemp)
+prog=$(TMPDIR="$CTDB_TEST_TMP_DIR" mktemp)
 cat > "$prog" <<EOF
 echo hello
 EOF
@@ -49,7 +49,7 @@ EOF
 unit_test run_proc_test 5 -1 "$prog"
 
 # Redirected output
-output=$(TMPDIR="$TEST_VAR_DIR" mktemp)
+output=$(TMPDIR="$CTDB_TEST_TMP_DIR" mktemp)
 cat > "$prog" <<EOF
 #!/bin/sh
 exec >"$output" 2>&1
@@ -110,7 +110,7 @@ EOF
 unit_test run_proc_test 1 -1 "$prog"
 
 # No zombie processes
-pidfile=$(TMPDIR="$TEST_VAR_DIR" mktemp)
+pidfile=$(TMPDIR="$CTDB_TEST_TMP_DIR" mktemp)
 
 cat > "$prog" <<EOF
 #!/bin/sh
diff --git a/ctdb/tests/cunit/sock_daemon_test_001.sh b/ctdb/tests/cunit/sock_daemon_test_001.sh
index 1b64c2ca9ff..54796079941 100755
--- a/ctdb/tests/cunit/sock_daemon_test_001.sh
+++ b/ctdb/tests/cunit/sock_daemon_test_001.sh
@@ -2,8 +2,8 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-pidfile="${TEST_VAR_DIR}/sock_daemon_test.pid.$$"
-sockpath="${TEST_VAR_DIR}/sock_daemon_test.sock.$$"
+pidfile="${CTDB_TEST_TMP_DIR}/sock_daemon_test.pid.$$"
+sockpath="${CTDB_TEST_TMP_DIR}/sock_daemon_test.sock.$$"
 
 remove_files ()
 {
diff --git a/ctdb/tests/cunit/sock_io_test_001.sh b/ctdb/tests/cunit/sock_io_test_001.sh
index 1ead2f37508..09a280c45e7 100755
--- a/ctdb/tests/cunit/sock_io_test_001.sh
+++ b/ctdb/tests/cunit/sock_io_test_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-sockpath="${TEST_VAR_DIR}/sock_daemon_test.sock.$$"
+sockpath="${CTDB_TEST_TMP_DIR}/sock_daemon_test.sock.$$"
 
 ok_null
 
diff --git a/ctdb/tests/cunit/system_socket_test_001.sh b/ctdb/tests/cunit/system_socket_test_001.sh
index 3fe9db39e13..4a74b8c64a0 100755
--- a/ctdb/tests/cunit/system_socket_test_001.sh
+++ b/ctdb/tests/cunit/system_socket_test_001.sh
@@ -2,7 +2,7 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-out_file="${TEST_VAR_DIR}/cunit/packet.out"
+out_file="${CTDB_TEST_TMP_DIR}/packet.out"
 
 remove_file ()
 {