From 18ecdbfb02e64ae7942378efb69df7541b5859f0 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 6 Sep 2019 19:58:46 +1000 Subject: [PATCH] ctdb-tests: Switch onnode unit tests to use CTDB_TEST_TMP_DIR Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/onnode/scripts/local.sh | 13 +++---------- ctdb/tests/onnode/stubs/ctdb | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ctdb/tests/onnode/scripts/local.sh b/ctdb/tests/onnode/scripts/local.sh index 1236145e5bd..4cb797031c4 100644 --- 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 8d1f855e5da..cca34c57e47 100755 --- 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 -- 2.47.3