ctdb-tests: 01.reclock event script setup modularisation

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 8230528c3fecffc5d552dc84500424b5358b3c71..2922f5d0220785510baad471582dd640df147b27 100755 (executable)
--- a/ctdb/tests/eventscripts/01.reclock.monitor.001.sh
+++ b/ctdb/tests/eventscripts/01.reclock.monitor.001.sh
@@ -4,6 +4,8 @@
 
 define_test "unset, check no-op"
 
+setup
+
 CTDB_RECOVERY_LOCK=""
 
 ok_null

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

diff --git a/ctdb/tests/eventscripts/01.reclock.monitor.003.sh b/ctdb/tests/eventscripts/01.reclock.monitor.003.sh
index 2d82a21d1eecf1828da69c853f8ca995d7d7001c..3e28ebbae7db90cebe68c121048388a426024482 100755 (executable)
--- a/ctdb/tests/eventscripts/01.reclock.monitor.003.sh
+++ b/ctdb/tests/eventscripts/01.reclock.monitor.003.sh
@@ -4,7 +4,7 @@
 
 define_test "set, exists"
 
-setup_reclock
+setup
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/01.reclock.monitor.004.sh b/ctdb/tests/eventscripts/01.reclock.monitor.004.sh
index 8ea0fd026fb6d388fdc597716b86b935f17196ae..965f2466b1620094e51e99c8897ba13bbbee77a7 100755 (executable)
--- a/ctdb/tests/eventscripts/01.reclock.monitor.004.sh
+++ b/ctdb/tests/eventscripts/01.reclock.monitor.004.sh
@@ -4,7 +4,7 @@
 
 define_test "set, doesn't exist, 4 times"
 
-setup_reclock
+setup
 rm -f "$CTDB_RECOVERY_LOCK"
 
 ok_null

diff --git a/ctdb/tests/eventscripts/01.reclock.monitor.005.sh b/ctdb/tests/eventscripts/01.reclock.monitor.005.sh
index 8572c25ff15a4b3c8ef06c3fee5824dc43c9c0ab..1590520469d79cd32eff0fbbdbef291a0eb573ab 100755 (executable)
--- a/ctdb/tests/eventscripts/01.reclock.monitor.005.sh
+++ b/ctdb/tests/eventscripts/01.reclock.monitor.005.sh
@@ -4,7 +4,7 @@
 
 define_test "set, doesn't exist, 4 times"
 
-setup_reclock
+setup
 rm -f "$CTDB_RECOVERY_LOCK"
 
 ok_null

diff --git a/ctdb/tests/eventscripts/scripts/01.reclock.sh b/ctdb/tests/eventscripts/scripts/01.reclock.sh
index aef1e0755672d13c9bf6d1e7e7136877776942c3..b6ab922d4bc35ece7309e7680c23c23e03f3613a 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/01.reclock.sh
+++ b/ctdb/tests/eventscripts/scripts/01.reclock.sh
@@ -7,10 +7,9 @@ cleanup_reclock ()
        done
 }
 
-setup_reclock ()
+setup ()
 {
-       CTDB_RECOVERY_LOCK=$(mktemp --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
-       export CTDB_RECOVERY_LOCK
+       export CTDB_RECOVERY_LOCK="${EVENTSCRIPTS_TESTS_VAR_DIR}/rec.lock"
 
        test_cleanup cleanup_reclock
 }