| Message ID | 20250219234956.520599-7-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4fde8398462f4c07e765460203f6d1b529e3f17a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | selftests: drv-net: improve the queue test for XSK | expand |
On Wed Feb 19 2025, Jakub Kicinski wrote: > 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> > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > tools/testing/selftests/drivers/net/queues.py | 9 +++++---- > tools/testing/selftests/net/lib/py/ksft.py | 5 +++++ > 2 files changed, 10 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 @@ import struct > if q['type'] == 'tx': > tx = True > > - ksft_eq(q['xsk'], {}) > + ksft_eq(q.get('xsk', None), {}, > + comment="xsk attr on queue we configured") Thanks. That's much better than getting exceptions in the case where no xsk attribute is available: Tested-by: Kurt Kanzenbach <kurt@linutronix.de>
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 @@ import struct 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) diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py index 3efe005436cd..fd23349fa8ca 100644 --- a/tools/testing/selftests/net/lib/py/ksft.py +++ b/tools/testing/selftests/net/lib/py/ksft.py @@ -71,6 +71,11 @@ KSFT_DISRUPTIVE = True _fail("Check failed", a, "not in", b, comment) +def ksft_not_in(a, b, comment=""): + if a in b: + _fail("Check failed", a, "in", b, comment) + + def ksft_is(a, b, comment=""): if a is not b: _fail("Check failed", a, "is not", b, comment)