Commit 353cfc0e authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

selftests: drv-net: Bring back tool() to driver __init__s 



The pp_alloc_fail.py test (which doesn't run in NIPA CI?) uses tool, add
back the import.

Resolves:
  ImportError: cannot import name 'tool' from 'lib.py'

Fixes: 68a05223 ("selftests: drv-net: update remaining Python init files")
Reviewed-by: default avatarNimrod Oren <noren@nvidia.com>
Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20260105163319.47619-1-gal@nvidia.com


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

tools/testing/selftests/drivers/net/hw/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, wait_port_listen, wait_file

        fd_read_timeout, ip, rand_port, wait_port_listen, wait_file, tool

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

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

        ksft_setup, ksft_variants, KsftNamedVariant
@@ -37,7 +37,7 @@ try: 
               "CmdExitFailure",

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

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

               "wait_port_listen", "wait_file",

               "wait_port_listen", "wait_file", "tool",

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

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

               "ksft_setup", "ksft_variants", "KsftNamedVariant",

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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ from .ksft import KsftFailEx, KsftSkipEx, KsftXfailEx, ksft_pr, ksft_eq, \ 
from .netns import NetNS, NetNSEnter

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

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

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

from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily
@@ -26,7 +26,7 @@ __all__ = ["KSRC", 
           "NetNS", "NetNSEnter",

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

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

           "wait_port_listen", "wait_file",

           "wait_port_listen", "wait_file", "tool",

           "NetdevSim", "NetdevSimDev",

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

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