diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2025-02-19 15:49:55 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-02-20 17:58:25 -0800 |
| commit | 4fde8398462f4c07e765460203f6d1b529e3f17a (patch) | |
| tree | 347c65a7b9915f5aec9c35974a91d6478edcfd0a /tools/testing/selftests/drivers/net/queues.py | |
| parent | selftests: drv-net: add a way to wait for a local process (diff) | |
| download | wireguard-linux-4fde8398462f4c07e765460203f6d1b529e3f17a.tar.xz wireguard-linux-4fde8398462f4c07e765460203f6d1b529e3f17a.zip | |
selftests: drv-net: improve the use of ksft helpers in XSK queue test
Avoid exceptions when xsk attr is not present, and add a proper ksft
helper for "not in" condition.
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Tested-by: Kurt Kanzenbach <kurt@linutronix.de>
Tested-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250219234956.520599-7-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rwxr-xr-x | tools/testing/selftests/drivers/net/queues.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py index 7af2adb61c25..a49f1a146e28 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 from lib.py import ksft_disruptive, ksft_exit, ksft_run -from lib.py import ksft_eq, ksft_raises, KsftSkipEx, KsftFailEx +from lib.py import ksft_eq, ksft_not_in, ksft_raises, KsftSkipEx, KsftFailEx from lib.py import EthtoolFamily, NetdevFamily, NlError from lib.py import NetDrvEnv from lib.py import bkg, cmd, defer, ip @@ -47,10 +47,11 @@ def check_xdp(cfg, nl, xdp_queue_id=0) -> None: if q['type'] == 'tx': tx = True - ksft_eq(q['xsk'], {}) + ksft_eq(q.get('xsk', None), {}, + comment="xsk attr on queue we configured") else: - if 'xsk' in q: - _fail("Check failed: xsk attribute set.") + ksft_not_in('xsk', q, + comment="xsk attr on queue we didn't configure") ksft_eq(rx, True) ksft_eq(tx, True) |