From b09ec84700d4a645e047e156284ada54fe8b6d7d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 22 Dec 2022 16:29:20 +0900 Subject: [PATCH] test-network: split out wait-online related test case --- test/test-network/systemd-networkd-tests.py | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 37705d8c729..78ec047e520 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1145,6 +1145,23 @@ class NetworkdMatchTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, 'Network File: /run/systemd/network/14-match-udev-property') +class WaitOnlineTests(unittest.TestCase, Utilities): + + def setUp(self): + setup_common() + + def tearDown(self): + tear_down_common() + + def test_wait_online_any(self): + copy_network_unit('25-bridge.netdev', '25-bridge.network', '11-dummy.netdev', '11-dummy.network') + start_networkd() + + self.wait_online(['bridge99', 'test1:degraded'], bool_any=True) + + self.wait_operstate('bridge99', '(off|no-carrier)', setup_state='configuring') + self.wait_operstate('test1', 'degraded') + class NetworkdNetDevTests(unittest.TestCase, Utilities): def setUp(self): @@ -1163,15 +1180,6 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, '00:50:56:c0:00:28') - def test_wait_online_any(self): - copy_network_unit('25-bridge.netdev', '25-bridge.network', '11-dummy.netdev', '11-dummy.network') - start_networkd() - - self.wait_online(['bridge99', 'test1:degraded'], bool_any=True) - - self.wait_operstate('bridge99', '(off|no-carrier)', setup_state='configuring') - self.wait_operstate('test1', 'degraded') - @expectedFailureIfModuleIsNotAvailable('bareudp') def test_bareudp(self): copy_network_unit('25-bareudp.netdev', '26-netdev-link-local-addressing-yes.network') -- 2.47.3