Skip to content

Commit

Permalink
[dhcp_relay] Remove skip dhcp_relay test when dhcp_server is enabled (s…
Browse files Browse the repository at this point in the history
…onic-net#16608)

What is the motivation for this PR?
This skip condition would take effect on all test cases under dhcp_relay folder, which would skip dhcpv6_relay tests too. But we don't want to skip it when dhcp_server is enabled.
And dhcpv4_relay test is only running in m0 and t0, which wouldn't enable dhcp_server

How did you do it?
Remove skip check

How did you verify/test it?
Run tests
  • Loading branch information
yaqiangz authored and mssonicbld committed Jan 24, 2025
1 parent 5dd4d93 commit 3b3262f
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions tests/dhcp_relay/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ def pytest_addoption(parser):
def check_dhcp_feature_status(duthost):
feature_status_output = duthost.show_and_parse("show feature status")
for feature in feature_status_output:
if feature["feature"] == "dhcp_server" and feature["state"] == "enabled":
pytest.skip("DHCPv4 relay is not supported when dhcp_server is enabled")
if feature["feature"] == "dhcp_relay" and feature["state"] != "enabled":
pytest.skip("dhcp_relay is not enabled")

Expand Down

0 comments on commit 3b3262f

Please sign in to comment.