From: Martin Schwenke <martin@meltin.net>
Date: Mon, 8 Jul 2019 06:17:27 +0000 (+1000)
Subject: ctdb-tests: Fix 01.reclock.script tests for non-default lock
X-Git-Tag: tdb-1.4.2~400
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecef4411302113b0513db30169a8481a0a521316;p=thirdparty%2Fsamba.git

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 2922f5d0220..c495a47960e 100755
--- 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 d82aecf5b92..7d0dcbf0d19 100755
--- 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 a7094317a11..7916d7fc668 100644
--- 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
 }