| Message ID | 20240705015222.675840-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0ee68a8bef9cf27e324a017691ee64b235c310e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] selftests: net: ksft: interrupt cleanly on KeyboardInterrupt | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 4 Jul 2024 18:52:22 -0700 you wrote: > It's very useful to be able to interrupt the tests during development. > Detect KeyboardInterrupt, run the cleanups and exit. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > tools/testing/selftests/net/lib/py/ksft.py | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Here is the summary with links: - [net-next] selftests: net: ksft: interrupt cleanly on KeyboardInterrupt https://git.kernel.org/netdev/net-next/c/e0ee68a8bef9 You are awesome, thank you!
diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py index 3aaa2748a58e..f26c20df9db4 100644 --- a/tools/testing/selftests/net/lib/py/ksft.py +++ b/tools/testing/selftests/net/lib/py/ksft.py @@ -146,6 +146,7 @@ KSFT_RESULT_ALL = True global KSFT_RESULT cnt = 0 + stop = False for case in cases: KSFT_RESULT = True cnt += 1 @@ -160,10 +161,13 @@ KSFT_RESULT_ALL = True except KsftXfailEx as e: comment = "XFAIL " + str(e) cnt_key = 'xfail' - except Exception as e: + except BaseException as e: + stop |= isinstance(e, KeyboardInterrupt) tb = traceback.format_exc() for line in tb.strip().split('\n'): ksft_pr("Exception|", line) + if stop: + ksft_pr("Stopping tests due to KeyboardInterrupt.") KSFT_RESULT = False cnt_key = 'fail' @@ -175,6 +179,9 @@ KSFT_RESULT_ALL = True ktap_result(KSFT_RESULT, cnt, case, comment=comment) totals[cnt_key] += 1 + if stop: + break + print( f"# Totals: pass:{totals['pass']} fail:{totals['fail']} xfail:{totals['xfail']} xpass:0 skip:{totals['skip']} error:0" )
It's very useful to be able to interrupt the tests during development. Detect KeyboardInterrupt, run the cleanups and exit. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- tools/testing/selftests/net/lib/py/ksft.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)