From: Yu Watanabe Date: Wed, 27 Feb 2019 10:22:27 +0000 (+0900) Subject: test-network: drop relevant ip routing policy rules before testing X-Git-Tag: v242-rc1~231^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=703bc7a2a67af315d2515b55d06eba63cf6ba9f1;p=thirdparty%2Fsystemd.git test-network: drop relevant ip routing policy rules before testing --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index fa5e08e7506..8600b56e4ca 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -659,6 +659,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): def test_routing_policy_rule(self): self.copy_unit_to_networkd_unit_path('routing-policy-rule.network', '11-dummy.netdev') + + subprocess.call(['ip', 'rule', 'del', 'table', '7']) + self.start_networkd() self.assertTrue(self.link_exits('test1')) @@ -677,6 +680,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): @expectedFailureIfRoutingPolicyPortRangeIsNotAvailable() def test_routing_policy_rule_port_range(self): self.copy_unit_to_networkd_unit_path('25-fibrule-port-range.network', '11-dummy.netdev') + + subprocess.call(['ip', 'rule', 'del', 'table', '7']) + self.start_networkd() self.assertTrue(self.link_exits('test1')) @@ -695,6 +701,9 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): @expectedFailureIfRoutingPolicyIPProtoIsNotAvailable() def test_routing_policy_rule_invert(self): self.copy_unit_to_networkd_unit_path('25-fibrule-invert.network', '11-dummy.netdev') + + subprocess.call(['ip', 'rule', 'del', 'table', '7']) + self.start_networkd() self.assertTrue(self.link_exits('test1')) @@ -1252,6 +1261,9 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): self.copy_unit_to_networkd_unit_path('11-dummy.netdev', '12-dummy.netdev', '26-bridge.netdev', '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network', 'bridge99-ignore-carrier-loss.network') + + subprocess.call(['ip', 'rule', 'del', 'table', '100']) + self.start_networkd() self.assertTrue(self.link_exits('dummy98')) @@ -1276,6 +1288,9 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): def test_bridge_ignore_carrier_loss_frequent_loss_and_gain(self): self.copy_unit_to_networkd_unit_path('26-bridge.netdev', '26-bridge-slave-interface-1.network', 'bridge99-ignore-carrier-loss.network') + + subprocess.call(['ip', 'rule', 'del', 'table', '100']) + self.start_networkd() self.assertTrue(self.link_exits('bridge99'))