]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: refuse routable state when no-carrier is expected
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 11 Jun 2021 21:45:49 +0000 (06:45 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 11 Jun 2021 23:51:16 +0000 (08:51 +0900)
If we do not set the maximum operstate in wait-online, then routable
state is allowed when no-carrier state is expected.

test/test-network/systemd-networkd-tests.py

index 33090b565d83e673951ac4e9681357b5b153ff51..2f1b11980908f40e1067f37af57002758dfae0d4 100755 (executable)
@@ -2044,7 +2044,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
             with self.subTest(carrier=carrier):
                 if carrier_map[carrier] != read_link_attr('test1', 'carrier'):
                     check_output(f'ip link set dev test1 carrier {carrier}')
-                self.wait_online([f'test1:{routable_map[carrier]}'])
+                self.wait_online([f'test1:{routable_map[carrier]}:{routable_map[carrier]}'])
 
                 output = check_output(*networkctl_cmd, '-n', '0', 'status', 'test1', env=env)
                 print(output)
@@ -2068,7 +2068,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
             with self.subTest(carrier=carrier, have_config=have_config):
                 if carrier_map[carrier] != read_link_attr('test1', 'carrier'):
                     check_output(f'ip link set dev test1 carrier {carrier}')
-                self.wait_online([f'test1:{routable_map[carrier]}'])
+                self.wait_online([f'test1:{routable_map[carrier]}:{routable_map[carrier]}'])
 
                 output = check_output(*networkctl_cmd, '-n', '0', 'status', 'test1', env=env)
                 print(output)