Updating monit syslog error matching regex (#2626)

After the merge of PR#sonic-net/sonic-buildimage#6100 the monit error syslog message will be changed with suffix having more information. Updating the testcases monit syslog matching regex to match the new change
sonic-net · Dec 5, 2020 · 806348a · 806348a
1 parent bd67873
commit 806348a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/tests/copp/test_copp.py b/tests/copp/test_copp.py
@@ -150,10 +150,10 @@ def ignore_expected_loganalyzer_exceptions(loganalyzer):
             loganalyzer: Loganalyzer utility fixture
     """
     ignoreRegex = [
-        ".*ERR monit.*'lldpd_monitor' process is not running",
-        ".*ERR monit.* 'lldp\|lldpd_monitor' status failed.*-- 'lldpd:' is not running.",
-        ".*ERR monit.*'lldp_syncd' process is not running",
-        ".*ERR monit.*'lldp\|lldp_syncd' status failed.*'python2 -m lldp_syncd' is not running.",
+        ".*ERR monit.*'lldpd_monitor' process is not running.*",
+        ".*ERR monit.* 'lldp\|lldpd_monitor' status failed.*-- 'lldpd:' is not running.*",
+        ".*ERR monit.*'lldp_syncd' process is not running.*",
+        ".*ERR monit.*'lldp\|lldp_syncd' status failed.*'python2 -m lldp_syncd' is not running.*",
         ".*snmp#snmp-subagent.*",
     ]
 

diff --git a/tests/qos/qos_sai_base.py b/tests/qos/qos_sai_base.py
@@ -473,21 +473,21 @@ def updateLoganalyzerExceptions(self, loganalyzer):
         """
         if loganalyzer:
             ignoreRegex = [
-                ".*ERR monit.*'lldpd_monitor' process is not running",
-                ".*ERR monit.* 'lldp\|lldpd_monitor' status failed.*-- 'lldpd:' is not running.",
+                ".*ERR monit.*'lldpd_monitor' process is not running.*",
+                ".*ERR monit.* 'lldp\|lldpd_monitor' status failed.*-- 'lldpd:' is not running.*",
 
-                ".*ERR monit.*'lldp_syncd' process is not running",
-                ".*ERR monit.*'lldp\|lldp_syncd' status failed.*-- 'python.* -m lldp_syncd' is not running.",
+                ".*ERR monit.*'lldp_syncd' process is not running.*",
+                ".*ERR monit.*'lldp\|lldp_syncd' status failed.*-- 'python.* -m lldp_syncd' is not running.*",
 
-                ".*ERR monit.*'bgpd' process is not running",
-                ".*ERR monit.*'bgp\|bgpd' status failed.*-- '/usr/lib/frr/bgpd' is not running.",
+                ".*ERR monit.*'bgpd' process is not running.*",
+                ".*ERR monit.*'bgp\|bgpd' status failed.*-- '/usr/lib/frr/bgpd' is not running.*",
 
-                ".*ERR monit.*'bgpcfgd' process is not running",
-                ".*ERR monit.*'bgp\|bgpcfgd' status failed.*-- '/usr/bin/python.* /usr/local/bin/bgpcfgd' is not running.",
+                ".*ERR monit.*'bgpcfgd' process is not running.*",
+                ".*ERR monit.*'bgp\|bgpcfgd' status failed.*-- '/usr/bin/python.* /usr/local/bin/bgpcfgd' is not running.*",
 
                 ".*ERR syncd#syncd:.*brcm_sai_set_switch_attribute:.*updating switch mac addr failed.*",
 
-                ".*ERR monit.*'bgp\|bgpmon' status failed.*'/usr/bin/python.* /usr/local/bin/bgpmon' is not running",
+                ".*ERR monit.*'bgp\|bgpmon' status failed.*'/usr/bin/python.* /usr/local/bin/bgpmon' is not running.*",
                 ".*ERR monit.*bgp\|fpmsyncd.*status failed.*NoSuchProcess process no longer exists.*",
             ]
             loganalyzer.ignore_regex.extend(ignoreRegex)