From: Yu Watanabe Date: Wed, 5 May 2021 14:04:24 +0000 (+0900) Subject: test-network: wait for the intreface is configured if it is expected X-Git-Tag: v249-rc1~240^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef2eedce756a7b1e8400fe9ab2441b16b7263b0;p=thirdparty%2Fsystemd.git test-network: wait for the intreface is configured if it is expected --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 1e50a75980a..cf009ee1786 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -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'))