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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/simple/19_ip_takeover_noop.sh b/ctdb/tests/simple/19_ip_takeover_noop.sh
index 4cfedb06b3bf4c1c8e72caa3e39b0c4136b101fe..c48379e58779919503093bcae95c7c805a2ec01c 100755 (executable)
--- 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 9ff59866f78da611cb8200284ae0b4145622be22..cb476a495f1d3d3a52a9fcd2a85005ee1a633f33 100755 (executable)
--- 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