Skip to content

Commit 353cfc0

Browse files
gal-pressmankuba-moo
authored andcommitted
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: 68a0522 ("selftests: drv-net: update remaining Python init files") Reviewed-by: Nimrod Oren <noren@nvidia.com> Signed-off-by: Gal Pressman <gal@nvidia.com> Link: https://patch.msgid.link/20260105163319.47619-1-gal@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent adb25a4 commit 353cfc0

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
NlError, RtnlFamily, DevlinkFamily, PSPFamily
2323
from net.lib.py import CmdExitFailure
2424
from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \
25-
fd_read_timeout, ip, rand_port, wait_port_listen, wait_file
25+
fd_read_timeout, ip, rand_port, wait_port_listen, wait_file, tool
2626
from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx
2727
from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \
2828
ksft_setup, ksft_variants, KsftNamedVariant
@@ -37,7 +37,7 @@
3737
"CmdExitFailure",
3838
"bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",
3939
"fd_read_timeout", "ip", "rand_port",
40-
"wait_port_listen", "wait_file",
40+
"wait_port_listen", "wait_file", "tool",
4141
"KsftSkipEx", "KsftFailEx", "KsftXfailEx",
4242
"ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run",
4343
"ksft_setup", "ksft_variants", "KsftNamedVariant",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from .netns import NetNS, NetNSEnter
1414
from .nsim import NetdevSim, NetdevSimDev
1515
from .utils import CmdExitFailure, fd_read_timeout, cmd, bkg, defer, \
16-
bpftool, ip, ethtool, bpftrace, rand_port, wait_port_listen, wait_file
16+
bpftool, ip, ethtool, bpftrace, rand_port, wait_port_listen, wait_file, tool
1717
from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily, RtnlAddrFamily
1818
from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily
1919

@@ -26,7 +26,7 @@
2626
"NetNS", "NetNSEnter",
2727
"CmdExitFailure", "fd_read_timeout", "cmd", "bkg", "defer",
2828
"bpftool", "ip", "ethtool", "bpftrace", "rand_port",
29-
"wait_port_listen", "wait_file",
29+
"wait_port_listen", "wait_file", "tool",
3030
"NetdevSim", "NetdevSimDev",
3131
"NetshaperFamily", "DevlinkFamily", "PSPFamily", "NlError",
3232
"YnlFamily", "EthtoolFamily", "NetdevFamily", "RtnlFamily",

0 commit comments

Comments
 (0)