We're about to add more features here and finding new issues with old ones in place is hard. Address ruff checks: - bare exceptions - f-string with no params - unused import
We need to use BaseException when handling defer(), as Petr points out. This retains the old behavior of ignoring SIGTERM while running cleanups.
Reviewed-by: Willem de Bruijn willemb@google.com Signed-off-by: Jakub Kicinski kuba@kernel.org --- v3: - Exception -> BaseException v2: https://lore.kernel.org/20251118215126.2225826-2-kuba@kernel.org --- tools/testing/selftests/net/lib/py/ksft.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py index 83b1574f7719..2eed24244b8a 100644 --- a/tools/testing/selftests/net/lib/py/ksft.py +++ b/tools/testing/selftests/net/lib/py/ksft.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0
-import builtins import functools import inspect import signal @@ -163,7 +162,7 @@ KSFT_DISRUPTIVE = True entry = global_defer_queue.pop() try: entry.exec_only() - except: + except BaseException: ksft_pr(f"Exception while handling defer / cleanup (callback {i} of {qlen_start})!") tb = traceback.format_exc() for line in tb.strip().split('\n'): @@ -181,7 +180,7 @@ KSFT_DISRUPTIVE = True @functools.wraps(func) def wrapper(*args, **kwargs): if not KSFT_DISRUPTIVE: - raise KsftSkipEx(f"marked as disruptive") + raise KsftSkipEx("marked as disruptive") return func(*args, **kwargs) return wrapper
@@ -199,7 +198,7 @@ KSFT_DISRUPTIVE = True return False try: return bool(int(value)) - except: + except Exception: raise Exception(f"failed to parse {name}")
if "DISRUPTIVE" in env: