From: Martin Schwenke Date: Fri, 23 Feb 2018 01:30:49 +0000 (+1100) Subject: ctdb-tests: Update some tests to use setup_ctdb() options X-Git-Tag: talloc-2.1.12~122 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4328f4a59e7e25d01f75bc3fe4e698dfedb8b4ed;p=thirdparty%2Fsamba.git ctdb-tests: Update some tests to use setup_ctdb() options Don't use environment variables for test-local configuration variations. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/simple/19_ip_takeover_noop.sh b/ctdb/tests/simple/19_ip_takeover_noop.sh index 4cfedb06b3b..c48379e5877 100755 --- a/ctdb/tests/simple/19_ip_takeover_noop.sh +++ b/ctdb/tests/simple/19_ip_takeover_noop.sh @@ -58,7 +58,8 @@ echo "----------------------------------------" daemons_stop echo "Starting CTDB with an empty public addresses configuration..." -CTDB_PUBLIC_ADDRESSES="/dev/null" daemons_start +setup_ctdb --no-public-addresses +daemons_start wait_until_ready diff --git a/ctdb/tests/simple/28_zero_eventscripts.sh b/ctdb/tests/simple/28_zero_eventscripts.sh index 9ff59866f78..cb476a495f1 100755 --- a/ctdb/tests/simple/28_zero_eventscripts.sh +++ b/ctdb/tests/simple/28_zero_eventscripts.sh @@ -29,9 +29,8 @@ ctdb_restart_when_done daemons_stop echo "Starting CTDB with an empty eventscript directory..." -empty_dir=$(mktemp -d --tmpdir="$TEST_VAR_DIR") -ctdb_test_exit_hook_add "rmdir $empty_dir" -CTDB_EVENT_SCRIPT_DIR="$empty_dir" daemons_start +setup_ctdb --no-event-scripts +daemons_start wait_until_ready