From fc14818a01f544b552a1284155544b37c439dd13 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Fri, 24 Feb 2017 13:45:59 -0600
Subject: [PATCH] Test: CTS: update patterns for recent log message changes

---
 cts/CTStests.py | 2 +-
 cts/patterns.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cts/CTStests.py b/cts/CTStests.py
index a48c54b..8e3e3fa 100644
--- a/cts/CTStests.py
+++ b/cts/CTStests.py
@@ -1824,7 +1824,7 @@ class Reattach(CTSTest):
     def errorstoignore(self):
         '''Return list of errors which should be ignored'''
         return [
-            r"resources were active at shutdown",
+            r"resource( was|s were) active at shutdown",
         ]
 
     def is_applicable(self):
diff --git a/cts/patterns.py b/cts/patterns.py
index 3f9ac6f..89492b4 100644
--- a/cts/patterns.py
+++ b/cts/patterns.py
@@ -255,7 +255,7 @@ class crm_cs_v0(BasePatterns):
         self.components["common-ignore"] = [
                     "Pending action:",
                     "error: crm_log_message_adv:",
-                    "resources were active at shutdown",
+                    r"resource( was|s were) active at shutdown",
                     "pending LRM operations at shutdown",
                     "Lost connection to the CIB service",
                     "Connection to the CIB terminated...",
-- 
1.8.3.1