From: Yu Watanabe Date: Thu, 22 Feb 2024 00:46:45 +0000 (+0900) Subject: test-network: use assertIn() X-Git-Tag: v256-rc1~776^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0183d48ddb7ab10fec5d7f2a69e5278c57d8ffef;p=thirdparty%2Fsystemd.git test-network: use assertIn() --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 466fa6cbf38..03e5690b282 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1618,12 +1618,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): output = check_output('ip -d link show test1') print(output) - self.assertRegex(output, ' mtu 2000 ') + self.assertIn(' mtu 2000 ', output) output = check_output('ip -d link show macvlan99') print(output) - self.assertRegex(output, ' mtu 2000 ') - self.assertRegex(output, 'macvlan mode ' + mode + ' ') + self.assertIn(' mtu 2000 ', output) + self.assertIn(f' macvlan mode {mode} ', output) remove_link('test1') time.sleep(1) @@ -1634,12 +1634,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): output = check_output('ip -d link show test1') print(output) - self.assertRegex(output, ' mtu 2000 ') + self.assertIn(' mtu 2000 ', output) output = check_output('ip -d link show macvlan99') print(output) - self.assertRegex(output, ' mtu 2000 ') - self.assertRegex(output, 'macvlan mode ' + mode + ' ') + self.assertIn(' mtu 2000 ', output) + self.assertIn(f' macvlan mode {mode} ', output) @expectedFailureIfModuleIsNotAvailable('ipvlan') def test_ipvlan(self):