Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
selftests: drv-net: update remaining Python init files
Convert remaining __init__ files similar to what we did in
commit b615879dbfea ("selftests: drv-net: make linters happy with our imports")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Jakub Kicinski
and committed by
David S. Miller
68a05223
65946eac
+57
-16
+29
-11
tools/testing/selftests/drivers/net/hw/lib/py/__init__.py
+29
-11
tools/testing/selftests/drivers/net/hw/lib/py/__init__.py
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
2
3
+
"""
4
+
Driver test environment (hardware-only tests).
5
+
NetDrvEnv and NetDrvEpEnv are the main environment classes.
6
+
Former is for local host only tests, latter creates / connects
7
+
to a remote endpoint. See NIPA wiki for more information about
8
+
running and writing driver tests.
9
+
"""
10
+
3
11
import sys
4
12
from pathlib import Path
5
13
···
16
8
try:
17
9
sys.path.append(KSFT_DIR.as_posix())
18
10
19
-
from net.lib.py import *
20
-
from drivers.net.lib.py import *
21
-
22
11
# Import one by one to avoid pylint false positives
12
+
from net.lib.py import NetNS, NetNSEnter, NetdevSimDev
23
13
from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \
24
14
NlError, RtnlFamily, DevlinkFamily, PSPFamily
25
15
from net.lib.py import CmdExitFailure
26
-
from net.lib.py import bkg, cmd, defer, ethtool, fd_read_timeout, ip, \
27
-
rand_port, tool, wait_port_listen
28
-
from net.lib.py import fd_read_timeout
16
+
from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \
17
+
fd_read_timeout, ip, rand_port, wait_port_listen, wait_file
29
18
from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx
30
19
from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \
31
20
ksft_setup
32
21
from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \
33
22
ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_none
34
-
from net.lib.py import NetNSEnter
35
-
from drivers.net.lib.py import GenerateTraffic
23
+
from drivers.net.lib.py import GenerateTraffic, Remote
36
24
from drivers.net.lib.py import NetDrvEnv, NetDrvEpEnv
25
+
26
+
__all__ = ["NetNS", "NetNSEnter", "NetdevSimDev",
27
+
"EthtoolFamily", "NetdevFamily", "NetshaperFamily",
28
+
"NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",
29
+
"CmdExitFailure",
30
+
"bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",
31
+
"fd_read_timeout", "ip", "rand_port",
32
+
"wait_port_listen", "wait_file",
33
+
"KsftSkipEx", "KsftFailEx", "KsftXfailEx",
34
+
"ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run",
35
+
"ksft_setup",
36
+
"ksft_eq", "ksft_ge", "ksft_in", "ksft_is", "ksft_lt",
37
+
"ksft_ne", "ksft_not_in", "ksft_raises", "ksft_true", "ksft_gt",
38
+
"ksft_not_none", "ksft_not_none",
39
+
"NetDrvEnv", "NetDrvEpEnv", "GenerateTraffic", "Remote"]
37
40
except ModuleNotFoundError as e:
38
-
ksft_pr("Failed importing `net` library from kernel sources")
39
-
ksft_pr(str(e))
40
-
ktap_result(True, comment="SKIP")
41
+
print("Failed importing `net` library from kernel sources")
42
+
print(str(e))
41
43
sys.exit(4)
+2
-2
tools/testing/selftests/drivers/net/lib/py/__init__.py
+2
-2
tools/testing/selftests/drivers/net/lib/py/__init__.py
···
22
22
NlError, RtnlFamily, DevlinkFamily, PSPFamily
23
23
from net.lib.py import CmdExitFailure
24
24
from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \
25
-
fd_read_timeout, ip, rand_port, tool, wait_port_listen, wait_file
25
+
fd_read_timeout, ip, rand_port, wait_port_listen, wait_file
26
26
from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx
27
27
from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \
28
28
ksft_setup
···
34
34
"NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",
35
35
"CmdExitFailure",
36
36
"bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",
37
-
"fd_read_timeout", "ip", "rand_port", "tool",
37
+
"fd_read_timeout", "ip", "rand_port",
38
38
"wait_port_listen", "wait_file",
39
39
"KsftSkipEx", "KsftFailEx", "KsftXfailEx",
40
40
"ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run",
+26
-3
tools/testing/selftests/net/lib/py/__init__.py
+26
-3
tools/testing/selftests/net/lib/py/__init__.py
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
2
3
+
"""
4
+
Python selftest helpers for netdev.
5
+
"""
6
+
3
7
from .consts import KSRC
4
-
from .ksft import *
8
+
from .ksft import KsftFailEx, KsftSkipEx, KsftXfailEx, ksft_pr, ksft_eq, \
9
+
ksft_ne, ksft_true, ksft_not_none, ksft_in, ksft_not_in, ksft_is, \
10
+
ksft_ge, ksft_gt, ksft_lt, ksft_raises, ksft_busy_wait, \
11
+
ktap_result, ksft_disruptive, ksft_setup, ksft_run, ksft_exit
5
12
from .netns import NetNS, NetNSEnter
6
-
from .nsim import *
7
-
from .utils import *
13
+
from .nsim import NetdevSim, NetdevSimDev
14
+
from .utils import CmdExitFailure, fd_read_timeout, cmd, bkg, defer, \
15
+
bpftool, ip, ethtool, bpftrace, rand_port, wait_port_listen, wait_file
8
16
from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily, RtnlAddrFamily
9
17
from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily
18
+
19
+
__all__ = ["KSRC",
20
+
"KsftFailEx", "KsftSkipEx", "KsftXfailEx", "ksft_pr", "ksft_eq",
21
+
"ksft_ne", "ksft_true", "ksft_not_none", "ksft_in", "ksft_not_in",
22
+
"ksft_is", "ksft_ge", "ksft_gt", "ksft_lt", "ksft_raises",
23
+
"ksft_busy_wait", "ktap_result", "ksft_disruptive", "ksft_setup",
24
+
"ksft_run", "ksft_exit",
25
+
"NetNS", "NetNSEnter",
26
+
"CmdExitFailure", "fd_read_timeout", "cmd", "bkg", "defer",
27
+
"bpftool", "ip", "ethtool", "bpftrace", "rand_port",
28
+
"wait_port_listen", "wait_file",
29
+
"NetdevSim", "NetdevSimDev",
30
+
"NetshaperFamily", "DevlinkFamily", "PSPFamily", "NlError",
31
+
"YnlFamily", "EthtoolFamily", "NetdevFamily", "RtnlFamily",
32
+
"RtnlAddrFamily"]