summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-06-17 11:11:30 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-06-18 11:35:12 +0900
commitad78d7b0275549f177db3f367c18532bd4be5c69 (patch)
tree140cb1a20f1bf31297386560b49be9a49bc93846 /test
parent4ef39b49919b998d249be48500fe4adf0ea18edc (diff)
downloadsystemd-ad78d7b0275549f177db3f367c18532bd4be5c69.tar.gz
test-network: rename l2tp_tunnel_remove -> remove_l2tp_tunnels
Diffstat (limited to 'test')
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index a505602926..97a75fba37 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)