]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: make NetworkdNetWorkTests.test_routing_policy_rule pass on CentOS
authorEvgeny Vereshchagin <evvers@ya.ru>
Fri, 2 Nov 2018 16:03:45 +0000 (17:03 +0100)
committerEvgeny Vereshchagin <evvers@ya.ru>
Fri, 2 Nov 2018 16:10:59 +0000 (17:10 +0100)
Depending on the content of /etc/iproute2/rt_dsfield, ip can print either
`0x08` or `throughput` as was shown in https://github.com/systemd/systemd/issues/10617#issuecomment-435200859.

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

index a0db6eeb93aaa37e8803978420e78c0eb8cceb1e..82d10ddc43d955a4afd704810b4c53d5fbdd58e1 100755 (executable)
@@ -425,7 +425,7 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         print(output)
         self.assertRegex(output, '111')
         self.assertRegex(output, 'from 192.168.100.18')
-        self.assertRegex(output, 'tos 0x08')
+        self.assertRegex(output, r'tos (?:0x08|throughput)\s')
         self.assertRegex(output, 'iif test1')
         self.assertRegex(output, 'oif test1')
         self.assertRegex(output, 'lookup 7')