1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00

test-network: make test_bind_carrier more stable

This commit is contained in:
Yu Watanabe 2019-12-09 00:39:33 +09:00 committed by Frantisek Sumsal
parent 84043bfd74
commit bc942f69aa

View File

@ -1991,13 +1991,14 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, 'default via 2607:5300:203:39ff:ff:ff:ff:ff proto static') self.assertRegex(output, 'default via 2607:5300:203:39ff:ff:ff:ff:ff proto static')
def test_bind_carrier(self): def test_bind_carrier(self):
check_output('ip link add dummy98 type dummy')
check_output('ip link set dummy98 up')
time.sleep(2)
copy_unit_to_networkd_unit_path('25-bind-carrier.network', '11-dummy.netdev') copy_unit_to_networkd_unit_path('25-bind-carrier.network', '11-dummy.netdev')
start_networkd() start_networkd()
self.wait_online(['test1:routable']) self.wait_online(['test1:routable'])
check_output('ip link add dummy98 type dummy')
check_output('ip link set dummy98 up')
time.sleep(2)
output = check_output('ip address show test1') output = check_output('ip address show test1')
print(output) print(output)
self.assertRegex(output, 'UP,LOWER_UP') self.assertRegex(output, 'UP,LOWER_UP')
@ -2021,7 +2022,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1') self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1')
self.check_operstate('test1', 'routable') self.check_operstate('test1', 'routable')
check_output('ip link del dummy99') check_output('ip link set dummy99 down')
time.sleep(2) time.sleep(2)
output = check_output('ip address show test1') output = check_output('ip address show test1')
print(output) print(output)
@ -2030,8 +2031,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertNotRegex(output, '192.168.10') self.assertNotRegex(output, '192.168.10')
self.check_operstate('test1', 'off') self.check_operstate('test1', 'off')
check_output('ip link add dummy98 type dummy') check_output('ip link set dummy99 up')
check_output('ip link set dummy98 up')
time.sleep(2) time.sleep(2)
output = check_output('ip address show test1') output = check_output('ip address show test1')
print(output) print(output)