ctdb-tests: Fix 01.reclock.script tests for non-default lock

These tests currently do not do what is expected.  They test the
default case.

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

diff --git a/ctdb/tests/eventscripts/01.reclock.monitor.001.sh b/ctdb/tests/eventscripts/01.reclock.monitor.001.sh
index 2922f5d0220785510baad471582dd640df147b27..c495a47960e585ee5c1f73666e6ff7df97b7a3b0 100755 (executable)
--- a/ctdb/tests/eventscripts/01.reclock.monitor.001.sh
+++ b/ctdb/tests/eventscripts/01.reclock.monitor.001.sh
@@ -4,9 +4,7 @@
 
 define_test "unset, check no-op"
 
-setup
-
-CTDB_RECOVERY_LOCK=""
+setup ""
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/01.reclock.monitor.002.sh b/ctdb/tests/eventscripts/01.reclock.monitor.002.sh
index d82aecf5b92890ed549514cd2b4257397d3692f2..7d0dcbf0d192caf981befba5e9a67b4582ee59dc 100755 (executable)
--- a/ctdb/tests/eventscripts/01.reclock.monitor.002.sh
+++ b/ctdb/tests/eventscripts/01.reclock.monitor.002.sh
@@ -4,9 +4,7 @@
 
 define_test "set to helper, check no-op"
 
-setup
-
-CTDB_RECOVERY_LOCK="!/some/recover/lock/helper foo"
+setup "!/some/recover/lock/helper foo"
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/scripts/01.reclock.sh b/ctdb/tests/eventscripts/scripts/01.reclock.sh
index a7094317a11db24d8953a16586f5b1aa0702bfe1..7916d7fc668b59528bcafe616d9a257a8d8719c5 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/01.reclock.sh
+++ b/ctdb/tests/eventscripts/scripts/01.reclock.sh
@@ -9,12 +9,19 @@ cleanup_reclock ()
 
 setup ()
 {
-       CTDB_RECOVERY_LOCK="${EVENTSCRIPTS_TESTS_VAR_DIR}/rec.lock"
+       if [ $# -eq 1 ] ; then
+               reclock="$1"
+       else
+               reclock="${EVENTSCRIPTS_TESTS_VAR_DIR}/reclock_subdir/rec.lock"
+       fi
+       CTDB_RECOVERY_LOCK="$reclock"
 
-       cat >>"${CTDB_BASE}/ctdb.conf" <<EOF
+       if [ -n "$CTDB_RECOVERY_LOCK" ] ; then
+               cat >>"${CTDB_BASE}/ctdb.conf" <<EOF
 [cluster]
        recovery lock = $CTDB_RECOVERY_LOCK
 EOF
+       fi
 
        test_cleanup cleanup_reclock
 }