Skip to content

Commit 8c9b36f

Browse files
yuwatabluca
authored andcommitted
test-network: split out wait-online related test case
(cherry picked from commit b09ec84)
1 parent f483155 commit 8c9b36f

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,23 @@ def test_delete_links(self):
10951095
self.check_link_exists('veth99', expected=False)
10961096
self.check_link_exists('veth-peer', expected=False)
10971097

1098+
class WaitOnlineTests(unittest.TestCase, Utilities):
1099+
1100+
def setUp(self):
1101+
setup_common()
1102+
1103+
def tearDown(self):
1104+
tear_down_common()
1105+
1106+
def test_wait_online_any(self):
1107+
copy_network_unit('25-bridge.netdev', '25-bridge.network', '11-dummy.netdev', '11-dummy.network')
1108+
start_networkd()
1109+
1110+
self.wait_online(['bridge99', 'test1:degraded'], bool_any=True)
1111+
1112+
self.wait_operstate('bridge99', '(off|no-carrier)', setup_state='configuring')
1113+
self.wait_operstate('test1', 'degraded')
1114+
10981115
class NetworkdNetDevTests(unittest.TestCase, Utilities):
10991116

11001117
def setUp(self):
@@ -1122,15 +1139,6 @@ def test_match_udev_property(self):
11221139
print(output)
11231140
self.assertRegex(output, 'Network File: /run/systemd/network/14-match-udev-property')
11241141

1125-
def test_wait_online_any(self):
1126-
copy_network_unit('25-bridge.netdev', '25-bridge.network', '11-dummy.netdev', '11-dummy.network')
1127-
start_networkd()
1128-
1129-
self.wait_online(['bridge99', 'test1:degraded'], bool_any=True)
1130-
1131-
self.wait_operstate('bridge99', '(off|no-carrier)', setup_state='configuring')
1132-
self.wait_operstate('test1', 'degraded')
1133-
11341142
@expectedFailureIfModuleIsNotAvailable('bareudp')
11351143
def test_bareudp(self):
11361144
copy_network_unit('25-bareudp.netdev', '26-netdev-link-local-addressing-yes.network')

0 commit comments

Comments
 (0)