From: Martin Schwenke Date: Tue, 7 Dec 2021 06:00:36 +0000 (+1100) Subject: ctdb-tests: Setup cluster with expected arguments X-Git-Tag: tdb-1.4.6~123 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef7e3265f76fbfdacdd9f17f3ddfca79ce823b60;p=thirdparty%2Fsamba.git 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 Reviewed-by: Amitay Isaacs --- 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 eccf0bea9da..a9119df6e4f 100755 --- 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 e6f63417abd..8a8290db649 100755 --- 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 () {