From f3f69b5c8df25b3f3bf7bd1fb9c5e62bd55910a3 Mon Sep 17 00:00:00 2001 From: Justin Wong Date: Thu, 29 May 2025 01:21:30 +0000 Subject: [PATCH 1/2] Skip bgp/test_bgp_multipath_relax.py on t1-isolated onal_mark/tests_mark_conditions.yaml --- tests/bgp/test_bgp_multipath_relax.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/bgp/test_bgp_multipath_relax.py b/tests/bgp/test_bgp_multipath_relax.py index 7725439ca3f..0d55669e192 100644 --- a/tests/bgp/test_bgp_multipath_relax.py +++ b/tests/bgp/test_bgp_multipath_relax.py @@ -67,6 +67,9 @@ def get_bgp_v4_neighbors_from_minigraph(duthost, tbinfo): def test_bgp_multipath_relax(tbinfo, duthosts, rand_one_dut_hostname): + if 't1-isolated' in tbinfo['topo']['name']: + pytest.skip("Test skipped for t1-isolated topologies") + duthost = duthosts[rand_one_dut_hostname] logger.info("Starting test_bgp_multipath_relax on topology {}".format(tbinfo['topo']['name'])) From 8a065bd53a1787de2336bc8e78c46105a88c2c81 Mon Sep 17 00:00:00 2001 From: Justin Wong Date: Tue, 10 Jun 2025 16:42:20 +0000 Subject: [PATCH 2/2] Swap skipping logic to be done in tests_mark_conditions.yaml --- tests/bgp/test_bgp_multipath_relax.py | 3 --- .../common/plugins/conditional_mark/tests_mark_conditions.yaml | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/bgp/test_bgp_multipath_relax.py b/tests/bgp/test_bgp_multipath_relax.py index 0d55669e192..7725439ca3f 100644 --- a/tests/bgp/test_bgp_multipath_relax.py +++ b/tests/bgp/test_bgp_multipath_relax.py @@ -67,9 +67,6 @@ def get_bgp_v4_neighbors_from_minigraph(duthost, tbinfo): def test_bgp_multipath_relax(tbinfo, duthosts, rand_one_dut_hostname): - if 't1-isolated' in tbinfo['topo']['name']: - pytest.skip("Test skipped for t1-isolated topologies") - duthost = duthosts[rand_one_dut_hostname] logger.info("Starting test_bgp_multipath_relax on topology {}".format(tbinfo['topo']['name'])) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 9cef4daef65..789b4a08c2c 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -158,8 +158,10 @@ bgp/test_bgp_gr_helper.py: bgp/test_bgp_multipath_relax.py: skip: reason: "Not supported topology backend." + conditions_logical_operator: or conditions: - "'backend' in topo_name" + - "'t1-isolated' in topo_name" bgp/test_bgp_port_disable.py: skip: