mirror of
https://github.com/systemd/systemd
synced 2024-10-15 20:45:09 +00:00
test/networkd-test: in bridge test, wait for online after restart systemd-networkd
without waiting for online, there is a race condition between systemd-networkd actually setting the new values and the test checking those values This also sets the link down before restarting systemd-networkd, to avoid the wait for online being a no-op
This commit is contained in:
parent
b2d7487071
commit
05575a104b
|
@ -247,7 +247,10 @@ Gateway=192.168.250.1
|
||||||
[Bridge]
|
[Bridge]
|
||||||
Priority=28
|
Priority=28
|
||||||
''')
|
''')
|
||||||
|
subprocess.check_call(['ip', 'link', 'set', 'dev', 'port1', 'down'])
|
||||||
subprocess.check_call(['systemctl', 'restart', 'systemd-networkd'])
|
subprocess.check_call(['systemctl', 'restart', 'systemd-networkd'])
|
||||||
|
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface',
|
||||||
|
'port1', '--timeout=5'])
|
||||||
self.assertEqual(self.read_attr('port1', 'brport/priority'), '28')
|
self.assertEqual(self.read_attr('port1', 'brport/priority'), '28')
|
||||||
|
|
||||||
def test_bridge_port_priority_set_zero(self):
|
def test_bridge_port_priority_set_zero(self):
|
||||||
|
@ -257,7 +260,10 @@ Priority=28
|
||||||
[Bridge]
|
[Bridge]
|
||||||
Priority=0
|
Priority=0
|
||||||
''')
|
''')
|
||||||
|
subprocess.check_call(['ip', 'link', 'set', 'dev', 'port2', 'down'])
|
||||||
subprocess.check_call(['systemctl', 'restart', 'systemd-networkd'])
|
subprocess.check_call(['systemctl', 'restart', 'systemd-networkd'])
|
||||||
|
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface',
|
||||||
|
'port2', '--timeout=5'])
|
||||||
self.assertEqual(self.read_attr('port2', 'brport/priority'), '0')
|
self.assertEqual(self.read_attr('port2', 'brport/priority'), '0')
|
||||||
|
|
||||||
def test_bridge_port_property(self):
|
def test_bridge_port_property(self):
|
||||||
|
@ -273,7 +279,10 @@ AllowPortToBeRoot=true
|
||||||
Cost=555
|
Cost=555
|
||||||
Priority=23
|
Priority=23
|
||||||
''')
|
''')
|
||||||
|
subprocess.check_call(['ip', 'link', 'set', 'dev', 'port2', 'down'])
|
||||||
subprocess.check_call(['systemctl', 'restart', 'systemd-networkd'])
|
subprocess.check_call(['systemctl', 'restart', 'systemd-networkd'])
|
||||||
|
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface',
|
||||||
|
'port2', '--timeout=5'])
|
||||||
|
|
||||||
self.assertEqual(self.read_attr('port2', 'brport/priority'), '23')
|
self.assertEqual(self.read_attr('port2', 'brport/priority'), '23')
|
||||||
self.assertEqual(self.read_attr('port2', 'brport/hairpin_mode'), '1')
|
self.assertEqual(self.read_attr('port2', 'brport/hairpin_mode'), '1')
|
||||||
|
|
Loading…
Reference in a new issue