Skip to content

[acl] ignore monit errors if test image is 201911 branch #2541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yxieca wants to merge 1 commit into from
Closed

[acl] ignore monit errors if test image is 201911 branch #2541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tests/acl/test_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
LOG_EXPECT_ACL_RULE_CREATE_RE = ".*Successfully created ACL rule.*"
LOG_EXPECT_ACL_RULE_REMOVE_RE = ".*Successfully deleted ACL rule.*"

LOG_IGNORE_RE = [
".*ERR monit.*"
]


@pytest.fixture(scope="module")
def setup(duthosts, rand_one_dut_hostname, tbinfo, ptfadapter):
Expand Down Expand Up @@ -276,6 +280,8 @@ def acl_table(duthosts, rand_one_dut_hostname, acl_table_config, backup_and_rest

try:
loganalyzer.expect_regex = [LOG_EXPECT_ACL_TABLE_CREATE_RE]
if "201911" in duthost.os_version:
loganalyzer.ignore_regex.extend(LOG_IGNORE_RE)
with loganalyzer:
logger.info("Creating ACL table from config file: \"{}\"".format(config_file))

Expand Down Expand Up @@ -366,6 +372,8 @@ def acl_rules(self, duthosts, rand_one_dut_hostname, localhost, setup, acl_table

try:
loganalyzer.expect_regex = [LOG_EXPECT_ACL_RULE_CREATE_RE]
if "201911" in duthost.os_version:
loganalyzer.ignore_regex.extend(LOG_IGNORE_RE)
with loganalyzer:
self.setup_rules(duthost, acl_table)

Expand Down