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

Fix test_monit #3708

Merged
merged 1 commit into from
Jun 29, 2021
Merged

Fix test_monit #3708

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
12 changes: 7 additions & 5 deletions tests/monit/test_monit_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def check_monit_last_output(duthost):
else:
return "/usr/bin/lldpmgrd' is not running in host" in monit_last_output
else:
pytes.fail("Failed to get Monit last output of process 'lldpmgrd'!")
pytest.fail("Failed to get Monit last output of process 'lldpmgrd'!")


def test_monit_status(duthosts, enum_rand_one_per_hwsku_frontend_hostname):
Expand All @@ -77,10 +77,12 @@ def test_monit_status(duthosts, enum_rand_one_per_hwsku_frontend_hostname):
None.
"""
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
monit_status_result = duthost.shell("sudo monit status", module_ignore_errors=True)

exit_code = monit_status_result["rc"]
pytest_assert(exit_code == 0, "Monit is either not running or not configured correctly")
def _monit_status():
monit_status_result = duthost.shell("sudo monit status", module_ignore_errors=True)
return monit_status_result["rc"] == 0
# Monit is configured with start delay = 300s, hence we wait up to 320s here
pytest_assert(wait_until(320, 20, _monit_status),
"Monit is either not running or not configured correctly")


def test_monit_reporting_message(duthosts, enum_rand_one_per_hwsku_frontend_hostname, disable_lldp):
Expand Down