shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

test-network: rename l2tp_tunnel_remove -> remove_l2tp_tunnels

Browse Source
This commit is contained in:
Yu Watanabe 2019-06-17 11:11:30 +09:00
parent 4ef39b4991
commit ad78d7b027
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test-network/systemd-networkd-tests.py
View File

@ -196,7 +196,7 @@ def remove_routes(routes):
for route_type, addr in routes: for route_type, addr in routes:
call('ip route del', route_type, addr, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) 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') output = check_output('ip l2tp show tunnel')
for tid in tunnel_ids: for tid in tunnel_ids:
words='Tunnel ' + tid + ', encap' words='Tunnel ' + tid + ', encap'
@ -1167,11 +1167,11 @@ class NetworkdL2TPTests(unittest.TestCase, Utilities):
l2tp_tunnel_ids = [ '10' ] l2tp_tunnel_ids = [ '10' ]
def setUp(self): def setUp(self):
l2tp_tunnel_remove(self.l2tp_tunnel_ids) remove_l2tp_tunnels(self.l2tp_tunnel_ids)
remove_links(self.links) remove_links(self.links)
def tearDown(self): def tearDown(self):
l2tp_tunnel_remove(self.l2tp_tunnel_ids) remove_l2tp_tunnels(self.l2tp_tunnel_ids)
remove_links(self.links) remove_links(self.links)
remove_unit_from_networkd_path(self.units) remove_unit_from_networkd_path(self.units)