system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 18:55:10 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #32743 from yuwata/test-network-for-mkosi

Browse source 
test-network: several improvements for running with mkosi
This commit is contained in:
Luca Boccassi 2024-05-10 11:27:14 +02:00 committed by GitHub
parent b2062ee2d9 24e37929ed
commit 086b277dc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
test/test-network/systemd-networkd-tests.py
View file

@ -192,8 +192,10 @@ def expectedFailureIfRoutingPolicyPortRangeIsNotAvailable():
def expectedFailureIfRoutingPolicyIPProtoIsNotAvailable():
def f(func):
rc = call_quiet('ip rule add not from 192.168.100.19 ipproto tcp table 7')
call_quiet('ip rule del not from 192.168.100.19 ipproto tcp table 7')
# IP protocol name is parsed by getprotobyname(), and it requires /etc/protocols.
# Hence. here we use explicit number: 6 == tcp.
rc = call_quiet('ip rule add not from 192.168.100.19 ipproto 6 table 7')
call_quiet('ip rule del not from 192.168.100.19 ipproto 6 table 7')
return func if rc == 0 else unittest.expectedFailure(func)
return f
@ -1666,6 +1668,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
print(output)
self.assertRegex(output, 'macvtap mode ' + mode + ' ')
@expectedFailureIfModuleIsNotAvailable('macvlan')
def test_macvlan(self):
first = True
for mode in ['private', 'vepa', 'bridge', 'passthru']:
@ -1710,7 +1713,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
self.assertIn(' mtu 2000 ', output)
self.assertIn(f' macvlan mode {mode} ', output)
self.assertIn(' bcqueuelen 1234 ', output)
self.assertIn(' bclim 2147483647 ', output)
if ' bclim ' in output: # This is new in kernel and iproute2 v6.4
self.assertIn(' bclim 2147483647 ', output)
@expectedFailureIfModuleIsNotAvailable('ipvlan')
def test_ipvlan(self):
@ -3293,12 +3297,12 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('ip rule')
print(output)
self.assertRegex(output, '111')
self.assertRegex(output, 'from 192.168.100.18')
self.assertRegex(output, '1123-1150')
self.assertRegex(output, '3224-3290')
self.assertRegex(output, 'tcp')
self.assertRegex(output, 'lookup 7')
self.assertIn('111:', output)
self.assertIn('from 192.168.100.18 ', output)
self.assertIn('sport 1123-1150 ', output)
self.assertIn('dport 3224-3290 ', output)
self.assertRegex(output, 'ipproto (tcp|ipproto-6) ')
self.assertIn('lookup 7 ', output)
@expectedFailureIfRoutingPolicyIPProtoIsNotAvailable()
def test_routing_policy_rule_invert(self):
@ -3308,10 +3312,11 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('ip rule')
print(output)
self.assertRegex(output, '111')
self.assertRegex(output, 'not.*?from.*?192.168.100.18')
self.assertRegex(output, 'tcp')
self.assertRegex(output, 'lookup 7')
self.assertIn('111:', output)
self.assertIn('not ', output)
self.assertIn('from 192.168.100.18 ', output)
self.assertRegex(output, 'ipproto (tcp|ipproto-6) ')
self.assertIn('lookup 7 ', output)
@expectedFailureIfRoutingPolicyL3MasterDeviceIsNotAvailable()
def test_routing_policy_rule_l3mdev(self):
@ -3332,10 +3337,10 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('ip rule')
print(output)
self.assertRegex(output, '111')
self.assertRegex(output, 'from 192.168.100.18')
self.assertRegex(output, 'lookup 7')
self.assertRegex(output, 'uidrange 100-200')
self.assertIn('111:', output)
self.assertIn('from 192.168.100.18 ', output)
self.assertIn('lookup 7 ', output)
self.assertIn('uidrange 100-200 ', output)
def _test_route_static(self, manage_foreign_routes):
if not manage_foreign_routes: