ctdb-tests: Setup cluster with expected arguments

ctdb_test_init() doesn't actually pass arguments to local_daemons.sh.
This needs to be done using ctdb_nodes_start_custom().

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh b/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh
index eccf0bea9daf8a95082bc9aa2ad93d5dafe77d2e..a9119df6e4f54447a5158642164b6ff419e5b91f 100755 (executable)
--- a/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh
+++ b/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh
@@ -8,7 +8,10 @@ set -e
 
 ctdb_test_skip_on_cluster
 
-ctdb_test_init -r 5
+ctdb_test_init -n
+
+echo "Starting CTDB with cluster lock recheck time set to 5s..."
+ctdb_nodes_start_custom -r 5
 
 generation_has_changed ()
 {

diff --git a/ctdb/tests/INTEGRATION/simple/cluster.016.reclock_move_lock_dir.sh b/ctdb/tests/INTEGRATION/simple/cluster.016.reclock_move_lock_dir.sh
index e6f63417abd49d656686d21723b97e339a3c352c..8a8290db64937bcd2e18e64404e41d45f40b4d09 100755 (executable)
--- a/ctdb/tests/INTEGRATION/simple/cluster.016.reclock_move_lock_dir.sh
+++ b/ctdb/tests/INTEGRATION/simple/cluster.016.reclock_move_lock_dir.sh
@@ -14,7 +14,10 @@ set -e
 
 ctdb_test_skip_on_cluster
 
-ctdb_test_init -r 5
+ctdb_test_init -n
+
+echo "Starting CTDB with cluster lock recheck time set to 5s..."
+ctdb_nodes_start_custom -r 5
 
 all_nodes_are_banned ()
 {