ctdb-tests: 00.ctdb testing setup modularisation

Switch to generic setup() function and set variables there.

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

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.001.sh b/ctdb/tests/eventscripts/00.ctdb.init.001.sh
index 320025ac282e971bb49d3cfe7507172124245832..807f3ef7352b4d8aa95513bc20fae2384a71a462 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.001.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.001.sh
@@ -4,7 +4,7 @@
 
 define_test "TDB check, tdbtool supports check"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.002.sh b/ctdb/tests/eventscripts/00.ctdb.init.002.sh
index 2777cc5eb4c12eec328dc9cd37c09e11332588a2..7ff5385676ce991c9185c3b607fc070f8434bc6e 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.002.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.002.sh
@@ -4,7 +4,7 @@
 
 define_test "TDB check, tdbtool does no support check"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="no"
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.003.sh b/ctdb/tests/eventscripts/00.ctdb.init.003.sh
index 27702104601ee6265ff2d1eb574f0de17d34cc2f..2d1fb0d506c9fce98696fc1bc7861162a5733674 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.003.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.003.sh
@@ -4,7 +4,7 @@
 
 define_test "TDB check, tdbtool supports check, good TDB"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.004.sh b/ctdb/tests/eventscripts/00.ctdb.init.004.sh
index de54bccb6ceeb57c5c020488c30b2478e3af6df8..196d7c2af7c78da8cd7cde10ef845184487063be 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.004.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.004.sh
@@ -4,18 +4,7 @@
 
 define_test "TDB check, tdbtool supports check, bad TDB"
 
-setup_ctdb
-
-FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
-
-result_filter ()
-{
-       _date="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
-       _time="[0-9][0-9][0-9][0-9][0-9][0-9]"
-       _nanos="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
-       _date_time="${_date}\.${_time}\.${_nanos}"
-       sed -e "s|\.${_date_time}\.|.DATE.TIME.|"
-}
+setup
 
 db="${CTDB_DBDIR}/foo.tdb.0"
 touch "$db"

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.005.sh b/ctdb/tests/eventscripts/00.ctdb.init.005.sh
index d11ab94885d88bb7f5f424ca6339993928683bdb..3f85de474badd6da79f5e502b727cb12bbe6d076 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.005.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.005.sh
@@ -4,7 +4,7 @@
 
 define_test "TDB check, tdbtool does not support check, good TDB"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="no"
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.006.sh b/ctdb/tests/eventscripts/00.ctdb.init.006.sh
index 29bf01e0469a9a4b82e1544b748c54a0bc86bf93..29794d71934dc0329ed099edf188bd005e80299c 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.006.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.006.sh
@@ -4,19 +4,10 @@
 
 define_test "TDB check, tdbtool does not support check, bad TDB"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="no"
 
-result_filter ()
-{
-       _date="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
-       _time="[0-9][0-9][0-9][0-9][0-9][0-9]"
-       _nanos="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
-       _date_time="${_date}\.${_time}\.${_nanos}"
-       sed -e "s|\.${_date_time}\.|.DATE.TIME.|"
-}
-
 db="${CTDB_DBDIR}/foo.tdb.0"
 touch "$db"
 FAKE_TDB_IS_OK="no"

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.007.sh b/ctdb/tests/eventscripts/00.ctdb.init.007.sh
index 1c954d7d8d166bd6e5067d6533358a0cff2616ac..a0741ce2f33293a66de9263edf302da4a4f5285b 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.007.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.007.sh
@@ -4,7 +4,7 @@
 
 define_test "TDB check, tdbtool supports check, good persistent TDB"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.008.sh b/ctdb/tests/eventscripts/00.ctdb.init.008.sh
index a6afdd8671ff0aa0eec922072ae48d697a2d1177..310c101f02cd043db479070478141172e5614d86 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.008.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.008.sh
@@ -4,7 +4,7 @@
 
 define_test "TDB check, tdbtool supports check, bad persistent TDB"
 
-setup_ctdb
+setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.009.sh b/ctdb/tests/eventscripts/00.ctdb.init.009.sh
index f546a7fdf27d63cf279a76a80f2547e7c56148cd..ca8107be8115edcf54da59ab5c40c292c482f491 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.009.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.009.sh
@@ -4,20 +4,11 @@
 
 define_test "TDB check, bad TDB multiple times"
 
-setup_ctdb
+setup
 
 db="${CTDB_DBDIR}/foo.tdb.0"
 FAKE_TDB_IS_OK="no"
 
-result_filter ()
-{
-       _date="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
-       _time="[0-9][0-9][0-9][0-9][0-9][0-9]"
-       _nanos="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
-       _date_time="${_date}\.${_time}\.${_nanos}"
-       sed -e "s|\.${_date_time}\.|.DATE.TIME.|"
-}
-
 required_result_tdbcheck ()
 {
        ok <<EOF

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.001.sh b/ctdb/tests/eventscripts/00.ctdb.setup.001.sh
index 1e094f8ba2d999826e85bd6db3560154c15f4e3a..8ab1c305cedd247e4ef9fadadb4df206846c490f 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.001.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.001.sh
@@ -4,7 +4,7 @@
 
 define_test "setup, no tunables in config"
 
-setup_ctdb
+setup
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh b/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
index c62b83cbcef8d2cbfc703643e3e0509279961720..e91f8d7e11cac4b8be1d49d8e5b830b9ea8ab673 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
@@ -4,7 +4,7 @@
 
 define_test "setup, known tunables in config"
 
-setup_ctdb
+setup
 
 setup_config <<EOF
 CTDB_SET_MonitorInterval=5

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh b/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
index 4ce704051f243b40fda0e2f45ac04eb279c6c5af..898a6835321ad9cc373db151e4f05ac988633d5d 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
@@ -4,7 +4,7 @@
 
 define_test "setup, known and unknown tunables in config"
 
-setup_ctdb
+setup
 
 setup_config <<EOF
 CTDB_SET_MonitorInterval=5

diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
index 6fd2dbfef126ab6b3588be79fb92414d1e71ab14..636cd2bead90ef7006e02ae29abdd1d87b1421af 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
@@ -4,7 +4,7 @@
 
 define_test "setup, known and obsolete tunables in config"
 
-setup_ctdb
+setup
 
 setup_config <<EOF
 CTDB_SET_MonitorInterval=5

diff --git a/ctdb/tests/eventscripts/scripts/00.ctdb.sh b/ctdb/tests/eventscripts/scripts/00.ctdb.sh
index 0086e4b119edea7d9d7b38b80744805b461e177a..68db2de996fa3624ffaa95bf7684197ada6ab720 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/00.ctdb.sh
+++ b/ctdb/tests/eventscripts/scripts/00.ctdb.sh
@@ -1,4 +1,35 @@
+setup ()
+{
+       setup_dbdir
+       setup_date
+
+       export FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
+       export FAKE_TDB_IS_OK="yes"
+
+       export FAKE_CTDB_TUNABLES_OK="
+              MonitorInterval
+              TDBMutexEnabled
+              DatabaseHashSize
+              "
+       export FAKE_CTDB_TUNABLES_OBSOLETE="
+              EventScriptUnhealthyOnTimeout
+              "
+}
+
 setup_config ()
 {
+       _t="${EVENTSCRIPTS_TESTS_VAR_DIR}/fake-tunable-config.sh"
+       export FAKE_CTDB_EXTRA_CONFIG="$_t"
+       rm -f "$FAKE_CTDB_EXTRA_CONFIG"
+
        cat >"$FAKE_CTDB_EXTRA_CONFIG"
 }
+
+result_filter ()
+{
+       _date="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
+       _time="[0-9][0-9][0-9][0-9][0-9][0-9]"
+       _nanos="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]"
+       _date_time="${_date}\.${_time}\.${_nanos}"
+       sed -e "s|\.${_date_time}\.|.DATE.TIME.|"
+}

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index ab09900fef6ef74b6aa138dd5e816dcddc319e48..78cdd6f3fc883eb4ffc870f0748f735b22a104d5 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -93,9 +93,6 @@ setup_generic ()
     mkdir -p "$FAKE_PROC_NET_BONDING"
     rm -f "$FAKE_PROC_NET_BONDING"/*
 
-    export FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
-    export FAKE_TDB_IS_OK
-
     setup_dbdir
     setup_date
 
@@ -290,13 +287,7 @@ setup_ctdb ()
 
     setup_public_addresses
 
-    export FAKE_CTDB_EXTRA_CONFIG="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-config.sh"
-    rm -f "$FAKE_CTDB_EXTRA_CONFIG"
-
     export CTDB_PARTIALLY_ONLINE_INTERFACES
-
-    export FAKE_CTDB_TUNABLES_OK="MonitorInterval TDBMutexEnabled DatabaseHashSize"
-    export FAKE_CTDB_TUNABLES_OBSOLETE="EventScriptUnhealthyOnTimeout"
 }
 
 validate_percentage ()