Commit 68a05223 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

selftests: drv-net: update remaining Python init files 



Convert remaining __init__ files similar to what we did in
commit b615879d ("selftests: drv-net: make linters happy with our imports")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65946eac

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

+29 −11
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



"""

Driver test environment (hardware-only tests).

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,36 @@ KSFT_DIR = (Path(__file__).parent / "../../../../..").resolve() 
try:

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



    from net.lib.py import *

    from drivers.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, defer, ethtool, fd_read_timeout, ip, \

        rand_port, tool, wait_port_listen

    from net.lib.py import fd_read_timeout

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

        fd_read_timeout, ip, rand_port, wait_port_listen, wait_file

    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

    from net.lib.py import NetNSEnter

    from drivers.net.lib.py import GenerateTraffic

    from drivers.net.lib.py import GenerateTraffic, Remote

    from drivers.net.lib.py import NetDrvEnv, NetDrvEpEnv



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

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

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

               "CmdExitFailure",

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

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

               "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",

               "NetDrvEnv", "NetDrvEpEnv", "GenerateTraffic", "Remote"]

except ModuleNotFoundError as e:

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

    ksft_pr(str(e))

    ktap_result(True, comment="SKIP")

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

    print(str(e))

    sys.exit(4)

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ try: 
        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

        fd_read_timeout, ip, rand_port, wait_port_listen, wait_file

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

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

        ksft_setup
@@ -34,7 +34,7 @@ try: 
               "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",

               "CmdExitFailure",

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

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

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

               "wait_port_listen", "wait_file",

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

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

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

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



"""

Python selftest helpers for netdev.

"""



from .consts import KSRC

from .ksft import *

from .ksft import KsftFailEx, KsftSkipEx, KsftXfailEx, ksft_pr, ksft_eq, \

    ksft_ne, ksft_true, ksft_not_none, ksft_in, ksft_not_in, ksft_is, \

    ksft_ge, ksft_gt, ksft_lt, ksft_raises, ksft_busy_wait, \

    ktap_result, ksft_disruptive, ksft_setup, ksft_run, ksft_exit

from .netns import NetNS, NetNSEnter

from .nsim import *

from .utils import *

from .nsim import NetdevSim, NetdevSimDev

from .utils import CmdExitFailure, fd_read_timeout, cmd, bkg, defer, \

    bpftool, ip, ethtool, bpftrace, rand_port, wait_port_listen, wait_file

from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily, RtnlAddrFamily

from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily



__all__ = ["KSRC",

           "KsftFailEx", "KsftSkipEx", "KsftXfailEx", "ksft_pr", "ksft_eq",

           "ksft_ne", "ksft_true", "ksft_not_none", "ksft_in", "ksft_not_in",

           "ksft_is", "ksft_ge", "ksft_gt", "ksft_lt", "ksft_raises",

           "ksft_busy_wait", "ktap_result", "ksft_disruptive", "ksft_setup",

           "ksft_run", "ksft_exit",

           "NetNS", "NetNSEnter",

           "CmdExitFailure", "fd_read_timeout", "cmd", "bkg", "defer",

           "bpftool", "ip", "ethtool", "bpftrace", "rand_port",

           "wait_port_listen", "wait_file",

           "NetdevSim", "NetdevSimDev",

           "NetshaperFamily", "DevlinkFamily", "PSPFamily", "NlError",

           "YnlFamily", "EthtoolFamily", "NetdevFamily", "RtnlFamily",

           "RtnlAddrFamily"]