Skip to content

Commit

Permalink
[sonic-mgmt] Correct conditional_mark for testcase "test_standby_tor_…
Browse files Browse the repository at this point in the history
…downstream_loopback_route_readded"

"dualtor/test_orchagent_standby_tor_downstream.py::test_standby_tor_downstream_loopback_route_readded" was
getting skipped earlier and started running recently after infra changes
done through PR#14395. Correcting the mark to skip above mentioned
testcase as earlier.

This reverts commit 95162cc.
  • Loading branch information
vkjammala-arista committed Nov 14, 2024
1 parent 95162cc commit 5f439d7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
19 changes: 1 addition & 18 deletions tests/dualtor/test_orchagent_standby_tor_downstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down Expand Up @@ -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)
)
Expand Down

0 comments on commit 5f439d7

Please sign in to comment.