File bsc#1155290-0005-Tests-cts-cli-simplify-fix-reg... of Package pacemaker.26929

Overview Repositories Revisions Requests Users Attributes Meta

File bsc#1155290-0005-Tests-cts-cli-simplify-fix-regexp-to-catch-crm_time_-1.1.patch of Package pacemaker.26929

From ac4fd533b31c53275fa3577915864325e8775fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
Date: Mon, 1 Apr 2019 22:57:12 +0200
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.

Backport-from-master-of: bfa3ddc527b8bfafe60b44185c1aa44abbdb5b7c
---
 tools/regression.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/regression.sh b/tools/regression.sh
index e839105e8..0c3862971 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -784,7 +784,7 @@ for t in $tests; do
         -e 's/constraints\.:([0-9][0-9]*)/constraints.:NNN/' \
         -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=\"\"/' \
 	$test_home/regression.$t.out
 
     if [ $do_save = 1 ]; then
-- 
2.16.4

Places

File bsc#1155290-0005-Tests-cts-cli-simplify-fix-regexp-to-catch-crm_time_-1.1.patch of Package pacemaker.26929

Places