From 5f68a6a46a4ccc08e1c3124fe302857ac08c421e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 May 2019 13:49:51 +0900 Subject: [PATCH] test-network: remove routes even on failure --- test/test-network/systemd-networkd-tests.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 877ca20047..425e19f80a 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -120,6 +120,10 @@ class Utilities(): for table in tables: subprocess.call(['ip', 'rule', 'del', 'table', table]) + def remove_routes(self, routes): + for route_type, addr in routes: + subprocess.call(['ip', 'route', 'del', route_type, addr]) + def l2tp_tunnel_remove(self, tunnel_ids): output = subprocess.check_output(['ip', 'l2tp', 'show', 'tunnel'], universal_newlines=True).rstrip() for tid in tunnel_ids: @@ -1103,13 +1107,16 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): 'routing-policy-rule-test1.network'] routing_policy_rule_tables = ['7', '8'] + routes = [['blackhole', '202.54.1.2'], ['unreachable', '202.54.1.3'], ['prohibit', '202.54.1.4']] def setUp(self): self.remove_routing_policy_rule_tables(self.routing_policy_rule_tables) + self.remove_routes(self.routes) self.link_remove(self.links) def tearDown(self): self.remove_routing_policy_rule_tables(self.routing_policy_rule_tables) + self.remove_routes(self.routes) self.link_remove(self.links) self.remove_unit_from_networkd_path(self.units) @@ -1281,10 +1288,6 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, 'prohibit 202.54.1.4 proto static') - subprocess.call(['ip', 'route', 'del', 'blackhole', '202.54.1.2']) - subprocess.call(['ip', 'route', 'del', 'unreachable', '202.54.1.3']) - subprocess.call(['ip', 'route', 'del', 'prohibit', '202.54.1.4']) - def test_ip_route_ipv6_src_route(self): # a dummy device does not make the addresses go through tentative state, so we # reuse a bond from an earlier test, which does make the addresses go through