From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 11 Jun 2021 21:45:49 +0000 (+0900)
Subject: test-network: refuse routable state when no-carrier is expected
X-Git-Tag: v249-rc1~27^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=705c7b18600f227f5cef9b0a7d43c367d0adb715;p=thirdparty%2Fsystemd.git

test-network: refuse routable state when no-carrier is expected

If we do not set the maximum operstate in wait-online, then routable
state is allowed when no-carrier state is expected.
---

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 33090b565d8..2f1b1198090 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -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)