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 feb78f3efa8dfed59004e075858e8503b3028009..eaa7b2d5b1c8d72ae2dd5a58201bc41ce86cf040 100755 (executable)
--- 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 97fbbfc24d36f2c4926452c0ab96911389dd71ca..c36a9f583a94983085491c4551723bc94745988b 100755 (executable)
--- 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 5f351d9e9e1dcc6c234ce82e19fcdd95c2517d98..e4f95c1f50984f18198d2014a3707c110678f7d2 100755 (executable)
--- 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 76ee62d1a2442715f0992e11b1e6a76db0d83309..a2fbf5189be96f5a00b2fb3960bed84a58b339b3 100755 (executable)
--- 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 bad1c1d2c782fcc5057f6a112282e683ca11f7ba..188964e41f6cb46d34fac5aa632a511b19988461 100755 (executable)
--- 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 d213aa88bfdb7a07170ea6544f56ac1e54f9abb3..9a8682b04e651e17aa7f50beace12e4285a82c04 100755 (executable)
--- 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 6491fa811a1f9ee31db92c978d4274729276677b..ad6d381d4ed09d1b82aa91d5f3849af2e624fabd 100755 (executable)
--- 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 28b06226866fcb01ae0eb85aa9425cc302d2088c..4e8d55397c0652e0f34d7099cb813366265ee126 100755 (executable)
--- 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 4578bdb543ca1413bdf337dd4d5b709c3cba97e2..10a36567dacdb8db1f463d19222b57403d5d5a6b 100755 (executable)
--- 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 cd48a84a78ac96635bd290b93561d9c311ef52eb..c16a43f8265644c3d5aa3988845af49e2bd55152 100755 (executable)
--- 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 d367cd48c2ef457bf9e071a4bcc97c80a60331b8..11b23fce0e5634aa3c51a8326a81cfff4da4611e 100755 (executable)
--- 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 adffeb7b1cabc5d02e91e81998804e9703e1e87c..8804448af89edc5d74b11b3c9c4b51520ec30a77 100755 (executable)
--- 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 0ef93653dc7f77bb5e8a9b4709b6eccdd1621ef1..0d6a38e9deaf7e191cd70c83d6fed0f3ba498bd0 100755 (executable)
--- 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 991d01a24e7451089abb73e1753c747ca542c7dd..5676893ba17eef3818f1cf3d69963936840da983 100755 (executable)
--- 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 7b2ff129b71e474241f14e037379674a76d48a4f..5713fc88bae4491c248f29b208181678c4b9399a 100755 (executable)
--- 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 fb80d62cf6fdbb668efad7db9c26aa44d79ea9e6..cf484039cbf98f2f73ac3130ad1dbd487015fece 100755 (executable)
--- 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 45ae619461070a89fa93b3305f4b09b29ac407c6..52291b20cc6ee218205d5924862add524265b31d 100755 (executable)
--- 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 75c51111b14f5003457efdb9a15877a6d4026454..50051bfaab20689953380391e695eb3d5cfb7913 100755 (executable)
--- 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 ac0c0da6ca435b553af2efcc5059d270ea6eeda5..3f48885298d841a339b078d59c895e3572123778 100755 (executable)
--- 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 1b64c2ca9ff77f2f3496d79a3bb10b775c34463c..54796079941bbe9f818aac15021d00e975f5158e 100755 (executable)
--- 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 1ead2f37508ac08eeb1ca4726af5c430e3d37531..09a280c45e75704190f248149c42b9872c5c5e20 100755 (executable)
--- 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 3fe9db39e138b9450ab2a9d9c5d7fd7768dd446a..4a74b8c64a00d3a70d433ea8383b3126a3796bbf 100755 (executable)
--- 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 ()
 {