Commit b615879d authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paolo Abeni
Browse files

selftests: drv-net: make linters happy with our imports 

Linters are still not very happy with our __init__ files,
which was pointed out in recent review (see Link).

We have previously started importing things one by one to
make linters happy with the test files (which import from __init__).
But __init__ file itself still makes linters unhappy.

To clean it up I believe we must completely remove the wildcard
imports, and assign the imported modules to __all__.

hds.py needs to be fixed because it seems to be importing
the Python standard random from lib.net.

We can't use ksft_pr() / ktap_result() in case importing
from net.lib fails. Linters complain that those helpers
themselves may not have been imported.

Link: https://lore.kernel.org/9d215979-6c6d-4e9b-9cdd-39cff595866e@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20251003164748.860042-1-kuba@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent c9d1b0b5

tools/testing/selftests/drivers/net/hds.py

+2 −1
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ 


import errno

import os

import random

from typing import Union

from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_raises, KsftSkipEx

from lib.py import CmdExitFailure, EthtoolFamily, NlError

from lib.py import NetDrvEnv

from lib.py import defer, ethtool, ip, random

from lib.py import defer, ethtool, ip





def _get_hds_mode(cfg, netnl) -> str:

tools/testing/selftests/drivers/net/lib/py/__init__.py

+31 −10
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



"""

Driver test environment.

NetDrvEnv and NetDrvEpEnv are the main environment classes.

Former is for local host only tests, latter creates / connects

to a remote endpoint. See NIPA wiki for more information about

running and writing driver tests.

"""



import sys

from pathlib import Path
@@ -8,26 +16,39 @@ KSFT_DIR = (Path(__file__).parent / "../../../..").resolve() 
try:

    sys.path.append(KSFT_DIR.as_posix())



    from net.lib.py import *



    # Import one by one to avoid pylint false positives

    from net.lib.py import NetNS, NetNSEnter, NetdevSimDev

    from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \

        NlError, RtnlFamily, DevlinkFamily, PSPFamily

    from net.lib.py import CmdExitFailure

    from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \

        fd_read_timeout, ip, rand_port, tool, wait_port_listen, wait_file

    from net.lib.py import fd_read_timeout

    from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx

    from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \

        ksft_setup

    from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \

        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_none

except ModuleNotFoundError as e:

    ksft_pr("Failed importing `net` library from kernel sources")

    ksft_pr(str(e))

    ktap_result(True, comment="SKIP")

    sys.exit(4)



from .env import *

from .load import *

    __all__ = ["NetNS", "NetNSEnter", "NetdevSimDev",

               "EthtoolFamily", "NetdevFamily", "NetshaperFamily",

               "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",

               "CmdExitFailure",

               "bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",

               "fd_read_timeout", "ip", "rand_port", "tool",

               "wait_port_listen", "wait_file",

               "KsftSkipEx", "KsftFailEx", "KsftXfailEx",

               "ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run",

               "ksft_setup",

               "ksft_eq", "ksft_ge", "ksft_in", "ksft_is", "ksft_lt",

               "ksft_ne", "ksft_not_in", "ksft_raises", "ksft_true", "ksft_gt",

               "ksft_not_none", "ksft_not_none"]



    from .env import NetDrvEnv, NetDrvEpEnv

    from .load import GenerateTraffic

    from .remote import Remote



    __all__ += ["NetDrvEnv", "NetDrvEpEnv", "GenerateTraffic", "Remote"]

except ModuleNotFoundError as e:

    print("Failed importing `net` library from kernel sources")

    print(str(e))

    sys.exit(4)