Commit 5cb7b71b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

selftests: net: py: coding style improvements 



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: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/20251120021024.2944527-2-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d99b408e

tools/testing/selftests/net/lib/py/ksft.py

+3 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



import builtins

import functools

import inspect

import signal
@@ -163,7 +162,7 @@ def ksft_flush_defer(): 
        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 @@ def ksft_disruptive(func): 
    @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 @@ def ksft_setup(env): 
            return False

        try:

            return bool(int(value))

        except:

        except Exception:

            raise Exception(f"failed to parse {name}")



    if "DISRUPTIVE" in env: