Skip to content

Commit 3d5026f

Browse files
tammelakuba-moo
authored andcommitted
selftests: tc-testing: use netns delete from pyroute2
When pyroute2 is available, use the native netns delete routine instead of calling iproute2 to do it. As forks are expensive with some kernel configs, minimize its usage to avoid kselftests timeouts. Signed-off-by: Pedro Tammela <pctammela@mojatatu.com> Reviewed-by: Simon Horman <horms@kernel.org> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Link: https://lore.kernel.org/r/20231117171208.2066136-4-pctammela@mojatatu.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 50a5988 commit 3d5026f

File tree

1 file changed

+8
-1
lines changed
  • tools/testing/selftests/tc-testing/plugin-lib

1 file changed

+8
-1
lines changed

tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ def post_case(self):
6464
if self.args.verbose:
6565
print('{}.post_case'.format(self.sub_class))
6666

67-
self._ns_destroy()
67+
if netlink == True:
68+
self._nl_ns_destroy()
69+
else:
70+
self._ns_destroy()
6871

6972
def post_suite(self, index):
7073
if self.args.verbose:
@@ -174,6 +177,10 @@ def _ns_create(self):
174177
'''
175178
self._exec_cmd_batched('pre', self._ns_create_cmds())
176179

180+
def _nl_ns_destroy(self):
181+
ns = self.args.NAMES['NS']
182+
netns.remove(ns)
183+
177184
def _ns_destroy_cmd(self):
178185
return self._replace_keywords('netns delete {}'.format(self.args.NAMES['NS']))
179186

0 commit comments

Comments
 (0)