Commit e0ee68a8 authored by Jakub Kicinski's avatar Jakub Kicinski

selftests: net: ksft: interrupt cleanly on KeyboardInterrupt

It's very useful to be able to interrupt the tests during development.
Detect KeyboardInterrupt, run the cleanups and exit.

Link: https://patch.msgid.link/20240705015222.675840-1-kuba@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5483cbfd
...@@ -146,6 +146,7 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()): ...@@ -146,6 +146,7 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()):
global KSFT_RESULT global KSFT_RESULT
cnt = 0 cnt = 0
stop = False
for case in cases: for case in cases:
KSFT_RESULT = True KSFT_RESULT = True
cnt += 1 cnt += 1
...@@ -160,10 +161,13 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()): ...@@ -160,10 +161,13 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()):
except KsftXfailEx as e: except KsftXfailEx as e:
comment = "XFAIL " + str(e) comment = "XFAIL " + str(e)
cnt_key = 'xfail' cnt_key = 'xfail'
except Exception as e: except BaseException as e:
stop |= isinstance(e, KeyboardInterrupt)
tb = traceback.format_exc() tb = traceback.format_exc()
for line in tb.strip().split('\n'): for line in tb.strip().split('\n'):
ksft_pr("Exception|", line) ksft_pr("Exception|", line)
if stop:
ksft_pr("Stopping tests due to KeyboardInterrupt.")
KSFT_RESULT = False KSFT_RESULT = False
cnt_key = 'fail' cnt_key = 'fail'
...@@ -175,6 +179,9 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()): ...@@ -175,6 +179,9 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()):
ktap_result(KSFT_RESULT, cnt, case, comment=comment) ktap_result(KSFT_RESULT, cnt, case, comment=comment)
totals[cnt_key] += 1 totals[cnt_key] += 1
if stop:
break
print( print(
f"# Totals: pass:{totals['pass']} fail:{totals['fail']} xfail:{totals['xfail']} xpass:0 skip:{totals['skip']} error:0" f"# Totals: pass:{totals['pass']} fail:{totals['fail']} xfail:{totals['xfail']} xpass:0 skip:{totals['skip']} error:0"
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment