summaryrefslogtreecommitdiff
path: root/ctdb/tests/INTEGRATION/simple
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2021-12-07 17:00:36 +1100
committerMartin Schwenke <martins@samba.org>2022-01-17 10:21:32 +0000
commitef7e3265f76fbfdacdd9f17f3ddfca79ce823b60 (patch)
tree63177f6dba18be21dd52099da35a1a85bc0db4b5 /ctdb/tests/INTEGRATION/simple
parentb029ca4d513163c4b0146c2a303130ae2a2581b4 (diff)
downloadsamba-ef7e3265f76fbfdacdd9f17f3ddfca79ce823b60.tar.gz
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>
Diffstat (limited to 'ctdb/tests/INTEGRATION/simple')
-rwxr-xr-xctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh5
-rwxr-xr-xctdb/tests/INTEGRATION/simple/cluster.016.reclock_move_lock_dir.sh5
2 files changed, 8 insertions, 2 deletions
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 ()
{