ctdb-tests: Make date handling consistent in 00.ctdb tests

This duplicates the filter function but that will be fixed later.

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

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.004.sh b/ctdb/tests/eventscripts/00.ctdb.init.004.sh
index b504d08b2c958696f680b446fae803e6dad48dc1..de54bccb6ceeb57c5c020488c30b2478e3af6df8 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.004.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.004.sh
@@ -8,15 +8,22 @@ 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.|"
+}
+
 db="${CTDB_DBDIR}/foo.tdb.0"
 touch "$db"
 FAKE_TDB_IS_OK="no"
 
-FAKE_DATE_OUTPUT="19690818.103000.000000001"
-
 ok <<EOF
 WARNING: database ${db} is corrupted.
- Moving to backup ${db}.${FAKE_DATE_OUTPUT}.corrupt for later analysis.
+ Moving to backup ${db}.DATE.TIME.corrupt for later analysis.
 EOF
 
 simple_test

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.006.sh b/ctdb/tests/eventscripts/00.ctdb.init.006.sh
index 745bca0f993ba3401e5162bdd52410355c3a531d..29bf01e0469a9a4b82e1544b748c54a0bc86bf93 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.006.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.006.sh
@@ -8,18 +8,25 @@ setup_ctdb
 
 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"
 
-FAKE_DATE_OUTPUT="19690818.103000.000000001"
-
 ok <<EOF
 WARNING: The installed 'tdbtool' does not offer the 'check' subcommand.
  Using 'tdbdump' for database checks.
  Consider updating 'tdbtool' for better checks!
 WARNING: database ${db} is corrupted.
- Moving to backup ${db}.${FAKE_DATE_OUTPUT}.corrupt for later analysis.
+ Moving to backup ${db}.DATE.TIME.corrupt for later analysis.
 EOF
 
 simple_test