ctdb-tests: Switch onnode 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/onnode/scripts/local.sh b/ctdb/tests/onnode/scripts/local.sh
index 1236145e5bd84864df2d350a410bcd7590537163..4cb797031c46859a5a5d56be9c00a94245dc89fd 100644 (file)
--- a/ctdb/tests/onnode/scripts/local.sh
+++ b/ctdb/tests/onnode/scripts/local.sh
@@ -8,14 +8,7 @@ stubs_dir="${CTDB_TEST_SUITE_DIR}/stubs"
 [ -d "${stubs_dir}" ] || die "Failed to locate stubs/ subdirectory"
 PATH="${stubs_dir}:${PATH}"
 
-[ -n "$TEST_VAR_DIR" ] || die "TEST_VAR_DIR unset"
-export ONNODE_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_onnode"
-if [ -d "$ONNODE_TESTS_VAR_DIR" ] ; then
-       rm -r "$ONNODE_TESTS_VAR_DIR"
-fi
-mkdir -p "$ONNODE_TESTS_VAR_DIR"
-
-setup_ctdb_base "$ONNODE_TESTS_VAR_DIR" "etc-ctdb" \
+setup_ctdb_base "$CTDB_TEST_TMP_DIR" "etc-ctdb" \
                functions
 
 define_test ()
@@ -28,10 +21,10 @@ define_test ()
 # Set output for ctdb command.  Option 1st argument is return code.
 ctdb_set_output ()
 {
-    _out="$ONNODE_TESTS_VAR_DIR/ctdb.out"
+    _out="${CTDB_TEST_TMP_DIR}/ctdb.out"
     cat >"$_out"
 
-    _rc="$ONNODE_TESTS_VAR_DIR/ctdb.rc"
+    _rc="${CTDB_TEST_TMP_DIR}/ctdb.rc"
     echo "${1:-0}" >"$_rc"
 
     test_cleanup "rm -f $_out $_rc"

diff --git a/ctdb/tests/onnode/stubs/ctdb b/ctdb/tests/onnode/stubs/ctdb
index 8d1f855e5dae55a67fe9ca0d3839c1ee37864c22..cca34c57e47acbc618e6d37ddb15822de3fe1872 100755 (executable)
--- a/ctdb/tests/onnode/stubs/ctdb
+++ b/ctdb/tests/onnode/stubs/ctdb
@@ -2,11 +2,11 @@
 
 # Fake ctdb client for onnode tests.
 
-out="${ONNODE_TESTS_VAR_DIR}/ctdb.out"
+out="${CTDB_TEST_TMP_DIR}/ctdb.out"
 if [ -r "$out" ] ; then
     cat "$out"
 
-    rc="${ONNODE_TESTS_VAR_DIR}/ctdb.rc"
+    rc="${CTDB_TEST_TMP_DIR}/ctdb.rc"
     if [ -r "$rc" ] ; then
        exit $(cat "$rc")
     fi