From ad78d7b0275549f177db3f367c18532bd4be5c69 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 17 Jun 2019 11:11:30 +0900 Subject: [PATCH 1/1] test-network: rename l2tp_tunnel_remove -> remove_l2tp_tunnels --- test/test-network/systemd-networkd-tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index a5056029269..97a75fba372 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -196,7 +196,7 @@ def remove_routes(routes): for route_type, addr in routes: call('ip route del', route_type, addr, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) -def l2tp_tunnel_remove(tunnel_ids): +def remove_l2tp_tunnels(tunnel_ids): output = check_output('ip l2tp show tunnel') for tid in tunnel_ids: words='Tunnel ' + tid + ', encap' @@ -1167,11 +1167,11 @@ class NetworkdL2TPTests(unittest.TestCase, Utilities): l2tp_tunnel_ids = [ '10' ] def setUp(self): - l2tp_tunnel_remove(self.l2tp_tunnel_ids) + remove_l2tp_tunnels(self.l2tp_tunnel_ids) remove_links(self.links) def tearDown(self): - l2tp_tunnel_remove(self.l2tp_tunnel_ids) + remove_l2tp_tunnels(self.l2tp_tunnel_ids) remove_links(self.links) remove_unit_from_networkd_path(self.units) -- 2.39.2