28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
|
From 86ba5e63eff051aa01b4872cee97896aecf38ef9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
||
|
|
Date: Sat, 19 Jan 2019 23:17:11 +0100
|
||
|
|
Subject: [PATCH] Tests: cts-cli: simplify+fix regexp to catch
|
||
|
|
crm_time_as_string's output
|
||
|
|
|
||
|
|
Previously, the cts-cli would only work with a zero-offset time zone
|
||
|
|
(suggesting that it was only run in the CI that may be expected to
|
||
|
|
have it like that). Also drop the atypical enumeration of all digits
|
||
|
|
vs. range capture.
|
||
|
|
---
|
||
|
|
cts/cts-cli.in | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/cts/cts-cli.in b/cts/cts-cli.in
|
||
|
|
index 34c094e76c..093dbcfa3a 100755
|
||
|
|
--- a/cts/cts-cli.in
|
||
|
|
+++ b/cts/cts-cli.in
|
||
|
|
@@ -938,7 +938,7 @@ for t in $tests; do
|
||
|
|
-e 's/^Entity: line [0-9][0-9]*: //'\
|
||
|
|
-e 's/\(validation ([0-9][0-9]* of \)[0-9][0-9]*\().*\)/\1X\2/' \
|
||
|
|
-e 's/^Migration will take effect until: .*/Migration will take effect until:/' \
|
||
|
|
- -e 's/ end=\"[-: 0123456789]*Z\?\"/ end=\"\"/' \
|
||
|
|
+ -e 's/ end=\"[0-9][-+: 0-9]*Z\?\"/ end=\"\"/' \
|
||
|
|
"$TMPFILE" > "${TMPFILE}.$$"
|
||
|
|
mv -- "${TMPFILE}.$$" "$TMPFILE"
|
||
|
|
|