Skip to content

Commit

Permalink
selftests: tc-testing: cleanup on Ctrl-C
Browse files Browse the repository at this point in the history
Cleanup net namespaces and other resources if we get a SIGINT (Ctrl-C).
As user visible resources are allocated on a per test basis, it's only
required to catch this condition when (possibly) running tests.

So far calling post_suite is enough to free up anything that might
linger.

A missing keyword replacement for nsPlugin is also included.

Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20231124154248.315470-5-pctammela@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Pedro Tammela authored and Jakub Kicinski committed Nov 28, 2023
1 parent 56e16bc commit 501679f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def post_suite(self, index):
print('{}.post_suite'.format(self.sub_class))

# Make sure we don't leak resources
cmd = "$IP -a netns del"
cmd = self._replace_keywords("$IP -a netns del")

if self.args.verbose > 3:
print('_exec_cmd: command "{}"'.format(cmd))
Expand Down
6 changes: 5 additions & 1 deletion tools/testing/selftests/tc-testing/tdc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,11 @@ def main():
if args.verbose > 2:
print('args is {}'.format(args))

set_operation_mode(pm, parser, args, remaining)
try:
set_operation_mode(pm, parser, args, remaining)
except KeyboardInterrupt:
# Cleanup on Ctrl-C
pm.call_post_suite(None)

if __name__ == "__main__":
main()

0 comments on commit 501679f

Please sign in to comment.