From 705c7b18600f227f5cef9b0a7d43c367d0adb715 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 12 Jun 2021 06:45:49 +0900 Subject: [PATCH] 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. --- test/test-network/systemd-networkd-tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 33090b565d..2f1b119809 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)