From: Martin Schwenke <martin@meltin.net>
Date: Wed, 7 Feb 2018 19:04:58 +0000 (+1100)
Subject: ctdb-tests: 00.ctdb testing setup modularisation
X-Git-Tag: talloc-2.1.13~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db5c6041522f72fa5a3f0f053f076769dbbab352;p=thirdparty%2Fsamba.git

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 320025ac282..807f3ef7352 100755
--- 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 2777cc5eb4c..7ff5385676c 100755
--- 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 27702104601..2d1fb0d506c 100755
--- 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 de54bccb6ce..196d7c2af7c 100755
--- 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 d11ab94885d..3f85de474ba 100755
--- 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 29bf01e0469..29794d71934 100755
--- 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 1c954d7d8d1..a0741ce2f33 100755
--- 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 a6afdd8671f..310c101f02c 100755
--- 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 f546a7fdf27..ca8107be811 100755
--- 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 1e094f8ba2d..8ab1c305ced 100755
--- 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 c62b83cbcef..e91f8d7e11c 100755
--- 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 4ce704051f2..898a6835321 100755
--- 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 6fd2dbfef12..636cd2bead9 100755
--- 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 0086e4b119e..68db2de996f 100644
--- 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 ab09900fef6..78cdd6f3fc8 100644
--- 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 ()