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

Use correct scope when parametrizing tests based on duts/asics #4961

Merged
merged 1 commit into from
Feb 8, 2022
Merged

Use correct scope when parametrizing tests based on duts/asics #4961

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
46 changes: 42 additions & 4 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,16 +1099,16 @@ def pytest_generate_tests(metafunc):
tuple_list.append((a_dut, a_asic))
else:
tuple_list.append((a_dut, None))
metafunc.parametrize(dut_fixture_name + "," + asic_fixture_name, tuple_list, scope="module")
metafunc.parametrize(dut_fixture_name + "," + asic_fixture_name, tuple_list, scope="module", indirect=True)
elif dut_fixture_name:
# parameterize only on DUT
metafunc.parametrize(dut_fixture_name, duts_selected, scope="module")
metafunc.parametrize(dut_fixture_name, duts_selected, scope="module", indirect=True)
elif asic_fixture_name:
# We have no duts selected, so need asic list for the first DUT
if len(asics_selected):
metafunc.parametrize(asic_fixture_name, asics_selected[0], scope="module")
metafunc.parametrize(asic_fixture_name, asics_selected[0], scope="module", indirect=True)
else:
metafunc.parametrize(asic_fixture_name, [None], scope="module")
metafunc.parametrize(asic_fixture_name, [None], scope="module", indirect=True)

if "enum_dut_portname" in metafunc.fixturenames:
metafunc.parametrize("enum_dut_portname", generate_port_lists(metafunc, "all_ports"))
Expand All @@ -1133,6 +1133,44 @@ def pytest_generate_tests(metafunc):
if 'enum_dut_lossy_prio' in metafunc.fixturenames:
metafunc.parametrize("enum_dut_lossy_prio", generate_priority_lists(metafunc, 'lossy'))


### Override enum fixtures for duts and asics to ensure that parametrization happens once per module.
@pytest.fixture(scope="module")
def enum_dut_hostname(request):
return request.param

@pytest.fixture(scope="module")
def enum_supervisor_dut_hostname(request):
return request.param

@pytest.fixture(scope="module")
def enum_frontend_dut_hostname(request):
return request.param

@pytest.fixture(scope="module")
def enum_rand_one_per_hwsku_hostname(request):
return request.param

@pytest.fixture(scope="module")
def enum_rand_one_per_hwsku_frontend_hostname(request):
return request.param

@pytest.fixture(scope="module")
def enum_asic_index(request):
return request.param

@pytest.fixture(scope="module")
def enum_frontend_asic_index(request):
return request.param

@pytest.fixture(scope="module")
def enum_backend_asic_index(request):
return request.param

@pytest.fixture(scope="module")
def enum_rand_one_asic_index(request):
return request.param

@pytest.fixture(scope="module")
def duthost_console(localhost, creds, request):
dut_hostname = request.config.getoption("ansible_host_pattern")
Expand Down