Skip to contentSkip to conversation

selftests: net: ksft: interrupt cleanly on KeyboardInterrupt

PATCH Applied Jakub Kicinski 2 participants 2 messages Jul 5, 2024 – Jul 8, 2024

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 tools/testing/selftests/net/lib/py/ksft.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
tools/testing/selftests/net/lib/py/ksft.py +8 -1
index 3aaa2748a58e..f26c20df9db4 100644
@@ -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"
     )
Signature · 1 line
2.45.2
#1 lore raw
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 7 lines · 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.

---
 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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html