Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f369e3f
cherry-pick config change and multivlan
w1nda May 9, 2024
f2027fc
slipt signle vlan to four vlans
w1nda May 10, 2024
023fce7
add dhcp_server_test.py
w1nda May 10, 2024
b30b34a
Update test_dhcp_server_multi_vlans.py
w1nda May 11, 2024
b2fdc79
Update test_dhcp_server.py
w1nda May 11, 2024
d5e4a10
Update test_dhcp_server_multi_vlans.py
w1nda May 11, 2024
0f15d19
add vlan interface change test case in test_dhcp_server_multi_vlans.py
w1nda May 13, 2024
2237a07
replace time.sleep with wait_util
w1nda May 13, 2024
47abcea
Add function to get running critical processes
w1nda May 13, 2024
27f5e2f
Add log for random variables
w1nda May 13, 2024
3415a9c
Add log for random variables
w1nda May 13, 2024
72ec75e
Remove critical process test
w1nda May 13, 2024
b25ddff
Remove critical process test
w1nda May 13, 2024
47e361e
Remove critical process test
w1nda May 13, 2024
970f27d
Remove
w1nda May 13, 2024
e7c5912
Remove critical process test
w1nda May 13, 2024
f666a62
Remove M0 topo mark
w1nda May 13, 2024
a42b177
Update test_dhcp_server.py
w1nda May 13, 2024
05d1890
Update test_dhcp_server_multi_vlans.py
w1nda May 13, 2024
e9c5d92
Update test_dhcp_server.py
w1nda May 13, 2024
841b11f
Update test_dhcp_server_multi_vlans.py
w1nda May 14, 2024
121f2e1
Update test_dhcp_server.py
w1nda May 14, 2024
df84909
Update dhcp_server_test_common.py
w1nda May 14, 2024
46250b8
Update test_dhcp_server_multi_vlans.py
w1nda May 20, 2024
4ff179d
Update test_dhcp_server.py
w1nda May 20, 2024
c76d0f5
Update dhcp_server_test_common.py
w1nda May 20, 2024
aecb745
Update test_dhcp_server.py
w1nda May 20, 2024
e42708e
Update test_dhcp_server_multi_vlans.py
w1nda May 20, 2024
41bc0e2
Update conftest.py
w1nda May 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/dhcp_server/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ def dhcp_server_setup_teardown(duthost):
def is_supervisor_subprocess_running(duthost, container_name, app_name):
return "RUNNING" in duthost.shell(f"docker exec {container_name} supervisorctl status {app_name}")["stdout"]
py_assert(
wait_until(20, 1, 1,
wait_until(120, 1, 1,
is_supervisor_subprocess_running,
duthost,
DHCP_SERVER_CONTAINER_NAME,
"dhcp-server-ipv4:kea-dhcp4"),
'feature dhcp_server is enabled but container is not running'
)
py_assert(
wait_until(30, 1, 1,
wait_until(120, 1, 1,
is_supervisor_subprocess_running,
duthost,
DHCP_RELAY_CONTAINER_NAME,
Expand Down
Loading