From: Martin Schwenke <martin@meltin.net>
Date: Wed, 21 Mar 2018 07:43:35 +0000 (+1100)
Subject: ctdb-tests: Make date handling consistent in 00.ctdb tests
X-Git-Tag: talloc-2.1.13~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4a4532e5c417146da3a30c00d74b2032e16dc66;p=thirdparty%2Fsamba.git

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 b504d08b2c9..de54bccb6ce 100755
--- 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 745bca0f993..29bf01e0469 100755
--- 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