Commit faa60990 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'selftests-drv-net-fix-and-improve-command-requirement-checking' 

Gal Pressman says:

====================
selftests: drv-net: Fix and improve command requirement checking

This series fixes remote command checking and cleans up command
requirement calls across tests.

The first patch fixes require_cmd() incorrectly checking commands
locally even when remote=True was specified due to a missing host
parameter.

The second patch makes require_cmd() usage explicit about local/remote
requirements, avoiding unnecessary test failures and consolidating
duplicate calls.
====================

Link: https://patch.msgid.link/20250723135454.649342-1-gal@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 43350127 d74cd9a0

tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py

+1 −2
Original line number Diff line number Diff line
@@ -451,8 +451,7 @@ def main() -> None: 
        )

        if not cfg.pci:

            raise KsftSkipEx("Could not get PCI address of the interface")

        cfg.require_cmd("iperf3")

        cfg.require_cmd("iperf3", remote=True)

        cfg.require_cmd("iperf3", local=True, remote=True)



        cfg.bw_validator = BandwidthValidator()

tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ def test_rss_input_xfrm(cfg, ipver): 
    if multiprocessing.cpu_count() < 2:

        raise KsftSkipEx("Need at least two CPUs to test symmetric RSS hash")



    cfg.require_cmd("socat", remote=True)

    cfg.require_cmd("socat", local=False, remote=True)



    if not hasattr(socket, "SO_INCOMING_CPU"):

        raise KsftSkipEx("socket.SO_INCOMING_CPU was added in Python 3.11")

tools/testing/selftests/drivers/net/hw/tso.py

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ def tcp_sock_get_retrans(sock): 




def run_one_stream(cfg, ipver, remote_v4, remote_v6, should_lso):

    cfg.require_cmd("socat", remote=True)

    cfg.require_cmd("socat", local=False, remote=True)



    port = rand_port()

    listen_cmd = f"socat -{ipver} -t 2 -u TCP-LISTEN:{port},reuseport /dev/null,ignoreeof"

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

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ class NetDrvEpEnv(NetDrvEnvBase): 
            if not self._require_cmd(comm, "local"):

                raise KsftSkipEx("Test requires command: " + comm)

        if remote:

            if not self._require_cmd(comm, "remote"):

            if not self._require_cmd(comm, "remote", host=self.remote):

                raise KsftSkipEx("Test requires (remote) command: " + comm)



    def wait_hw_stats_settle(self):

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ from lib.py import ksft_pr, cmd, ip, rand_port, wait_port_listen 


class GenerateTraffic:

    def __init__(self, env, port=None):

        env.require_cmd("iperf3", remote=True)

        env.require_cmd("iperf3", local=True, remote=True)



        self.env = env