diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index baa5e89f28f..efe51aaea55 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -472,9 +472,9 @@ dualtor/test_orchagent_standby_tor_downstream.py::test_standby_tor_downstream_bg dualtor/test_orchagent_standby_tor_downstream.py::test_standby_tor_downstream_loopback_route_readded: skip: - reason: "This testcase is designed for single tor testbed with mock dualtor config and dualtor." + reason: "This testcase is designed for single tor testbed with mock dualtor config." conditions: - - "(topo_type not in ['t0'])" + - "(topo_type not in ['t0']) or ('dualtor' in topo_name)" dualtor/test_orchagent_standby_tor_downstream.py::test_standby_tor_downstream_t1_link_recovered: skip: diff --git a/tests/dualtor/test_orchagent_standby_tor_downstream.py b/tests/dualtor/test_orchagent_standby_tor_downstream.py index 08ccbb626ed..b59e6f4cc1b 100644 --- a/tests/dualtor/test_orchagent_standby_tor_downstream.py +++ b/tests/dualtor/test_orchagent_standby_tor_downstream.py @@ -41,23 +41,6 @@ logger = logging.getLogger(__file__) -@pytest.fixture(autouse=True) -def ignore_expected_loganalyzer_exception(loganalyzer, duthosts): - - ignore_errors = [ - r".* ERR syncd#syncd: .*SAI_API_TUNNEL:_brcm_sai_mptnl_tnl_route_event_add:\d+ ecmp table entry lookup " - "failed with error.*", - r".* ERR syncd#syncd: .*SAI_API_TUNNEL:_brcm_sai_mptnl_process_route_add_mode_default_and_host:\d+ " - "_brcm_sai_mptnl_tnl_route_event_add failed with error.*" - ] - - if loganalyzer: - for duthost in duthosts: - loganalyzer[duthost.hostname].ignore_regex.extend(ignore_errors) - - return None - - @pytest.fixture(params=['ipv4', 'ipv6']) def ip_version(request): """Traffic IP version to test.""" @@ -279,7 +262,7 @@ def test_standby_tor_downstream_loopback_route_readded( rand_unselected_dut.shell("config bgp start all") pt_assert( wait_until( - 60, 1, 0, + 10, 1, 0, lambda: route_matches_expected_state(rand_selected_dut, active_tor_loopback0, expect_route=True)), "Expected route {} not found on {}".format(active_tor_loopback0, rand_selected_dut) )