From a419bb9918f6bc8c0cc48adfc7510d2b4f6ea297 Mon Sep 17 00:00:00 2001 From: Chenyang Wang Date: Fri, 5 Dec 2025 16:26:12 +1100 Subject: [PATCH 1/2] fix: only disable route check for T2 Signed-off-by: Chenyang Wang --- tests/conftest.py | 6 +++++- tests/pc/test_po_cleanup.py | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index ca945f6f1bb..c90d9eb22a0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3013,13 +3013,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 936c93c2844..907ad83281b 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 From 8ee81d2e74935a1dafe81ac205540ef29c0b1b74 Mon Sep 17 00:00:00 2001 From: Chenyang Wang Date: Sat, 6 Dec 2025 11:37:48 +1100 Subject: [PATCH 2/2] Empty commit to re-trigger the pipeline Signed-off-by: Chenyang Wang