]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: do not fail test_macvlan() with old kernel or ip command
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 May 2024 05:36:38 +0000 (14:36 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 May 2024 05:36:38 +0000 (14:36 +0900)
test/test-network/systemd-networkd-tests.py

index a6cfa91382aa1f43c36381e5edb28657344eb9b1..8531f963b156a85749fa20e3d444441228cdcfee 100755 (executable)
@@ -1711,7 +1711,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):