diff --git a/tests/conftest.py b/tests/conftest.py index bda1ba829a..979a612bc6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2733,13 +2733,17 @@ def _remove_entry(table_name, key_name, config): @pytest.fixture(scope="module", autouse=True) -def temporarily_disable_route_check(request, duthosts): +def temporarily_disable_route_check(request, tbinfo, duthosts): check_flag = False for m in request.node.iter_markers(): if m.name == "disable_route_check": check_flag = True break + if 't2' not in tbinfo['topo']['name']: + logger.info("Topology is not T2, skipping temporarily_disable_route_check fixture") + check_flag = False + def wait_for_route_check_to_pass(dut): def run_route_check(): diff --git a/tests/pc/test_po_cleanup.py b/tests/pc/test_po_cleanup.py index de761eb44c..f2a3750313 100644 --- a/tests/pc/test_po_cleanup.py +++ b/tests/pc/test_po_cleanup.py @@ -40,10 +40,13 @@ def ignore_expected_loganalyzer_exceptions(enum_rand_one_per_hwsku_frontend_host @pytest.fixture(autouse=True) -def disable_route_check_for_duthost(duthosts, enum_rand_one_per_hwsku_frontend_hostname): - duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname] - logging.info("Stopping route check on DUT {}".format(duthost.hostname)) - stop_route_checker_on_duthost(duthost) +def disable_route_check_for_duthost(tbinfo, duthosts, enum_rand_one_per_hwsku_frontend_hostname): + if 't2' not in tbinfo['topo']['name']: + logging.info("Topology is not T2, skipping disabling route check") + else: + duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname] + logging.info("Stopping route check on DUT {}".format(duthost.hostname)) + stop_route_checker_on_duthost(duthost) yield