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

ctdb-tests: Switch takeover helper 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/takeover_helper/scripts/local.sh b/ctdb/tests/takeover_helper/scripts/local.sh
index 7aa8734595a..d15ec93f03f 100644
--- a/ctdb/tests/takeover_helper/scripts/local.sh
+++ b/ctdb/tests/takeover_helper/scripts/local.sh
@@ -11,7 +11,7 @@ fi
 PATH="${PATH}:${CTDB_SCRIPTS_TOOLS_HELPER_DIR}"
 PATH="${PATH}:${CTDB_SCRIPTS_HELPER_BINDIR}"
 
-setup_ctdb_base "$TEST_VAR_DIR" "takeover_helper"
+setup_ctdb_base "$CTDB_TEST_TMP_DIR" "ctdb-etc"
 
 ctdbd_socket=$(ctdb-path socket "ctdbd")
 ctdbd_pidfile=$(ctdb-path pidfile "ctdbd")
@@ -79,7 +79,7 @@ test_ctdb_ip_all ()
 	unit_test ctdb -d "$CTDB_DEBUGLEVEL" ip all || exit $?
 }
 
-takeover_helper_out="${TEST_VAR_DIR}/takover_helper.out"
+takeover_helper_out="${CTDB_TEST_TMP_DIR}/takover_helper.out"
 
 takeover_helper_format_outfd ()
 {