From 17ce050061328eee56d74bf3e81b4cde70e28679 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Wed, 24 Apr 2019 22:38:01 +0800 Subject: [PATCH] [ntpd] Update matching pattern of 'ERR ntpd' in loganalyzer ignore files (#865) The ntpd may generate 'ERR ntpd' in syslog and caused unnecessary test case failure. Previous PR https://github.com/Azure/sonic-mgmt/pull/816 added a matching pattern of 'ERR ntpd' in loganalyzer igonre files to ignore the ntpd error messages. However, ntpd may generate two formats of error messages. The previously added matching pattern can only match one of the formats. This change is to update the pattern to match both of the formats. Signed-off-by: Xin Wang --- .../test/files/tools/loganalyzer/loganalyzer_common_ignore.txt | 2 +- ansible/roles/test/tasks/acl/acltb_ignore_messages.txt | 2 +- ansible/roles/test/tasks/fib/fib_ignore_messages.txt | 2 +- ansible/roles/test/tasks/lag/lag_ignore_messages.txt | 2 +- .../test/tasks/pfc_wd/config_test/config_test_ignore_messages | 2 +- .../test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/roles/test/files/tools/loganalyzer/loganalyzer_common_ignore.txt b/ansible/roles/test/files/tools/loganalyzer/loganalyzer_common_ignore.txt index 2a562f47972..03bada03d8b 100644 --- a/ansible/roles/test/files/tools/loganalyzer/loganalyzer_common_ignore.txt +++ b/ansible/roles/test/files/tools/loganalyzer/loganalyzer_common_ignore.txt @@ -1 +1 @@ -r, ".* ERR ntpd.*: routing socket reports: No buffer space available" +r, ".* ERR ntpd.*routing socket reports: No buffer space available.*" diff --git a/ansible/roles/test/tasks/acl/acltb_ignore_messages.txt b/ansible/roles/test/tasks/acl/acltb_ignore_messages.txt index 2a562f47972..03bada03d8b 100644 --- a/ansible/roles/test/tasks/acl/acltb_ignore_messages.txt +++ b/ansible/roles/test/tasks/acl/acltb_ignore_messages.txt @@ -1 +1 @@ -r, ".* ERR ntpd.*: routing socket reports: No buffer space available" +r, ".* ERR ntpd.*routing socket reports: No buffer space available.*" diff --git a/ansible/roles/test/tasks/fib/fib_ignore_messages.txt b/ansible/roles/test/tasks/fib/fib_ignore_messages.txt index 2a562f47972..03bada03d8b 100644 --- a/ansible/roles/test/tasks/fib/fib_ignore_messages.txt +++ b/ansible/roles/test/tasks/fib/fib_ignore_messages.txt @@ -1 +1 @@ -r, ".* ERR ntpd.*: routing socket reports: No buffer space available" +r, ".* ERR ntpd.*routing socket reports: No buffer space available.*" diff --git a/ansible/roles/test/tasks/lag/lag_ignore_messages.txt b/ansible/roles/test/tasks/lag/lag_ignore_messages.txt index 2a562f47972..03bada03d8b 100644 --- a/ansible/roles/test/tasks/lag/lag_ignore_messages.txt +++ b/ansible/roles/test/tasks/lag/lag_ignore_messages.txt @@ -1 +1 @@ -r, ".* ERR ntpd.*: routing socket reports: No buffer space available" +r, ".* ERR ntpd.*routing socket reports: No buffer space available.*" diff --git a/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages b/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages index b7b81fce8eb..b93ffa1530b 100644 --- a/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages +++ b/ansible/roles/test/tasks/pfc_wd/config_test/config_test_ignore_messages @@ -5,4 +5,4 @@ r, ".* Unknown.*" r, ".* SAI_STATUS_ATTR_NOT_SUPPORT.*" r, ".* snmp.*" r, ".* Trying to remove nonexisting queue from flex counter .*" -r, ".* ERR ntpd.*: routing socket reports: No buffer space available" +r, ".* ERR ntpd.*routing socket reports: No buffer space available.*" diff --git a/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages b/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages index effc6c88b5d..391d16ed990 100644 --- a/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages +++ b/ansible/roles/test/tasks/pfc_wd/functional_test/ignore_pfc_wd_messages @@ -6,4 +6,4 @@ r, ".* SAI_STATUS_ATTR_NOT_SUPPORT.*" r, ".* snmp.*" r, ".* Trying to remove nonexisting queue from flex counter .*" r, ".* SAI_STATUS_BUFFER_OVERFLOW" -r, ".* ERR ntpd.*: routing socket reports: No buffer space available" +r, ".* ERR ntpd.*routing socket reports: No buffer space available.*"