Skip to content

[pytest] Skip testing the auto-restart feature of radv container on T1 devices #2308

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

Merged
yxieca merged 5 commits into from
Oct 12, 2020
Merged

[pytest] Skip testing the auto-restart feature of radv container on T1 devices #2308

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0cdc16
[pytest] The radv container will be skipped for testing auto-restart
yozhao101 Oct 5, 2020
65a35cb
[pytest] Add comment to explain why we skip testing the radv container
yozhao101 Oct 5, 2020
58c9851
[pytest] Add more T1 device types.
yozhao101 Oct 8, 2020
69f29e3
[pytest] Use 'tbinfo["topo"]["type"] != "t1"' to skip the T1 devices.
yozhao101 Oct 9, 2020
54fa236
[pytest] I should use tbinfo["topo"]["type"] != "t0" to skip testing the
yozhao101 Oct 10, 2020
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
9 changes: 5 additions & 4 deletions ...estart_test/test_container_autorestart.py → ...autorestart/test_container_autorestart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def kill_process_by_pid(duthost, container_name, program_name, program_pid):

# Get the exit code of 'kill' command
exit_code = kill_cmd_result["rc"]
if exit_code != 0:
if exit_code != 0:
pytest.fail("Failed to stop program '{}' before test".format(program_name))

logger.info("Program '{}' in container '{}' was stopped successfully"
Expand Down Expand Up @@ -203,7 +203,7 @@ def verify_no_autorestart_with_non_critical_process(duthost, container_name, pro
duthost.shell("docker exec {} supervisorctl start {}".format(container_name, program_name))


def test_containers_autorestart(duthost):
def test_containers_autorestart(duthost, tbinfo):
"""
@summary: Test the auto-restart feature of each container against two scenarios: killing
a non-critical process to verify the container is still running; killing each
Expand All @@ -213,8 +213,9 @@ def test_containers_autorestart(duthost):
disabled_containers = get_disabled_container_list(duthost)

for container_name in container_autorestart_states.keys():
# Skip testing the database container or containers/services which are disabled
if container_name in disabled_containers or container_name == "database":
# Skip testing the database container, radv container on T1 devices and containers/services which are disabled
if (container_name in disabled_containers or container_name == "database"
or (container_name == "radv" and tbinfo["topo"]["type"] != "t0")):
logger.warning("Skip testing the container '{}'".format(container_name))
continue

Expand Down