Skip to content
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

Jump to bottom

ignore 75-persistent-net-generator.rules in e2e tests #2862

Merged
merged 4 commits into from
Jun 30, 2023
Merged

ignore 75-persistent-net-generator.rules in e2e tests #2862

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
035b9bd
ignore 75-persistent-net-generator.rules in e2e tests
nagworld9 Jun 29, 2023
816f55f
address comment
nagworld9 Jun 29, 2023
072bd5a
remove
nagworld9 Jun 29, 2023
c5809cb
Merge branch 'develop' into ignore-warn
nagworld9 Jun 30, 2023
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: 2 additions & 6 deletions tests_e2e/tests/lib/agent_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@ def get_errors(self) -> List[AgentLogRecord]:
#
# NOTE: This list was taken from the older agent tests and needs to be cleaned up. Feel free to un-comment rules as new tests are added.
#
# # This warning is expected on SUSE 12
# {
# 'message': r"WARNING EnvHandler ExtHandler Move rules file 75-persistent-net-generator.rules to /var/lib/waagent/75-persistent-net-generator.rules",
# 'if': lambda _: re.match(r"((sles15\.2)|suse12)\D*", DISTRO_NAME, flags=re.IGNORECASE) is not None
# },
# # The following message is expected to log an error if systemd is not enabled on it
# {
# 'message': r"Did not detect Systemd, unable to set wa(|linux)agent-network-setup.service",
Expand Down Expand Up @@ -139,10 +134,11 @@ def get_errors(self) -> List[AgentLogRecord]:
# and r.prefix == "Daemon"
# },
#
# 2023-06-28T09:31:38.903835Z WARNING EnvHandler ExtHandler Move rules file 75-persistent-net-generator.rules to /var/lib/waagent/75-persistent-net-generator.rules
# The environment thread performs this operation periodically
#
{
'message': r"Move rules file 70-persistent-net.rules to /var/lib/waagent/70-persistent-net.rules",
'message': r"Move rules file (70|75)-persistent.*.rules to /var/lib/waagent/(70|75)-persistent.*.rules",
'if': lambda r: r.level == "WARNING"
},
#
Expand Down