mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-04 07:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

test-network: shorten sleep time a bit

Browse Source 
Network interfaces will be ready after lease is acquired.
Hence, it is not necessary to wait more than lease time.
This commit is contained in:
Yu Watanabe 2022-07-09 06:22:39 +09:00
parent 1a8e1d7853
commit a102a52c34
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/test-network/systemd-networkd-tests.py
View File

@ -4610,8 +4610,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
lease_time='2m') lease_time='2m')
# Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120 # Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120
print('Wait for the dynamic address to be renewed') print('Wait for the DHCP lease to be expired')
time.sleep(125) time.sleep(120)
self.wait_online(['veth99:routable', 'veth-peer:routable']) self.wait_online(['veth99:routable', 'veth-peer:routable'])
@ -4784,8 +4784,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
start_dnsmasq(ipv6_range='2600::30,2600::40', lease_time='2m') start_dnsmasq(ipv6_range='2600::30,2600::40', lease_time='2m')
# Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120 # Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120
print('Wait for the dynamic address to be renewed') print('Wait for the DHCP lease to be expired')
time.sleep(125) time.sleep(120)
self.wait_online(['veth99:routable']) self.wait_online(['veth99:routable'])
@ -4813,8 +4813,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
stop_dnsmasq() stop_dnsmasq()
# Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120 # Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120
print('Wait for the dynamic address to be expired') print('Wait for the DHCP lease to be expired')
time.sleep(125) time.sleep(120)
print('The lease address should be kept after lease expired') print('The lease address should be kept after lease expired')
output = check_output('ip address show dev veth99 scope global') output = check_output('ip address show dev veth99 scope global')
@ -5010,8 +5010,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
output = check_output('ip -4 address show dev veth99 scope link') output = check_output('ip -4 address show dev veth99 scope link')
self.assertNotRegex(output, r'inet 169\.254\.\d+\.\d+/16 metric 2048 brd 169\.254\.255\.255 scope link') self.assertNotRegex(output, r'inet 169\.254\.\d+\.\d+/16 metric 2048 brd 169\.254\.255\.255 scope link')
print('Wait for the dynamic address to be expired') print('Wait for the DHCP lease to be expired')
time.sleep(130) time.sleep(120)
output = check_output('ip address show dev veth99') output = check_output('ip address show dev veth99')
print(output) print(output)
@ -5607,15 +5607,8 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities):
self.verify_dhcp4_6rd(tunnel_name) self.verify_dhcp4_6rd(tunnel_name)
# Test for renewing/rebinding lease print('Wait for the DHCP lease to be expired')
print('wait for 120 sec') time.sleep(120)
time.sleep(30)
print('wait for 90 sec')
time.sleep(30)
print('wait for 60 sec')
time.sleep(30)
print('wait for 30 sec')
time.sleep(30)
dump_dnsmasq_log_file() dump_dnsmasq_log_file()