SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-network: wait for the intreface is configured if it is expected

Browse Source
This commit is contained in:
Yu Watanabe
2021-05-12 11:26:06 +09:00
parent 5cb76467af
commit 1ef2eedce7
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test-network/systemd-networkd-tests.py
+2 -6
View File
@@ -2784,20 +2784,16 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
expect_up = initial_up
next_up = not expect_up
# if initial expected state is down, must wait for setup_state to reach configuring
# so systemd-networkd considers it 'activated'
setup_state = None if initial_up else 'configuring'
for iteration in range(4):
with self.subTest(iteration=iteration, expect_up=expect_up):
operstate = 'routable' if expect_up else 'off'
setup_state = 'configured' if expect_up else None
self.wait_operstate('test1', operstate, setup_state=setup_state, setup_timeout=20)
setup_state = None
if expect_up:
self.assertIn('UP', check_output('ip link show test1'))
self.assertIn('192.168.10.30/24', check_output('ip address show test1'))
self.assertIn('default via 192.168.10.1', check_output('ip route show'))
self.assertIn('default via 192.168.10.1', check_output('ip route show dev test1'))
else:
self.assertIn('DOWN', check_output('ip link show test1'))