Skip to content

test updates

Florian Westphal netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7tests: make runtest.sh work with readonly-cwdtests/big_sort.sh tests/bitmap:ip.t tests/check_klog.sh +40 more+265 -2570 replies
2/7tests: runtest.sh: run inside namespacetests/runtest.sh+20 -10 replies
3/7tests: diff.sh: preserve file nametests/diff.sh+10 -30 replies
4/7tests: check_klog.sh: unclutter stderrtests/check_klog.sh tests/sendip.sh+7 -30 replies
5/7tests: setlist_ns.sh: use local ipset binary and don't rely on usernstests/runtest.sh tests/setlist_ns.sh+26 -40 replies
6/7tests: make setlist_resize.sh more verbose on errortests/setlist_resize.sh+28 -60 replies
7/7tests: runtest.sh: add sendip emulation via scapyREADME tests/bitmap:ip.t tests/check_sendip_packets +5 more+188 -120 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH ipset 0/7] test updates

Hi Jozsef,

This contains various enhancments for the ipsets tests/runtest.sh.

The largest enhancement is the removal of the sendip dependency, in the last patch -- this adds a sendip emulation via scapy. Note that 'sendip' will be used if present and the bundled scapy sendip.py otherwise.

Main motivation was to make runtest.sh work with my CI pipeline. This uses nipa (https://github.com/linux-netdev/nipa.git).
Test scripts spawn kernels via virtme-ng.

1) resolve the above. Add a temporary directory, export IPSET_TMPDIR to all scripts and use that in the tests to write files there instead of cwd.

2) make test setup simpler: re-exec runtest.sh in a new namespace if IPSET_UNSHARED is unset (the default). A dummy eth0 device for tests is added in the new namespace. This makes ./runtest.sh self-contained, no extra work needed. Also avoids clashes with the test network addresses used by test scripts.

3) diff.sh: preserve file names in diff output: use the new temporary directory to store the postprocessed dump files before compare. This isn't needed but it helps to spot the cause of failures more easily, as the failing dump name is preserved in the diff output.

4) check_klog.sh: Enable direct fallback to dmesg without error messages. Not needed either, but it un-clutters stderr in my environment.

5) Use the local ipset binary instead of host binary. Allow fallback to plain "unshare -n" if user namespaces are not supported. Parallelize the test and increase iteration count to 124. 'unshare -Unr' doesn't work in my setup but 'unshare -n' does and it should be good enough. Note the script will still unse unshare -Unr by default, it only falls back once the first try fails.

6) Make setlist_resize.sh more verbose on error:
Capture command output to a temporary file, then dump log on failure. This also fixes a spurious error, the script uses 'set -e' and occasionally the first 'rmmod' try fails here which made the script exit too early.

7) Add scapy-based sendip emulation to runtest.sh. Fall bacl to a scapy-based alternative if sendip isn't found in PATH.

Florian Westphal (7):
tests: make runtest.sh work with readonly-cwd
tests: runtest.sh: run inside namespace
tests: diff.sh: preserve file name
tests: check_klog.sh: unclutter stderr
tests: setlist_ns.sh: use local ipset binary and don't rely on userns
tests: make setlist_resize.sh more verbose on error
tests: runtest.sh: add sendip emulation via scapy

 README                      |  13 +--
 tests/big_sort.sh           |   8 +-
 tests/bitmap:ip.t           |  30 +++----
 tests/check_klog.sh         |  11 ++-
 tests/check_sendip_packets  |   2 +-
 tests/comment.t             |  32 ++++----
 tests/diff.sh               |  13 ++-
 tests/hash:ip,mark.t        |   8 +-
 tests/hash:ip,port,ip.t     |   8 +-
 tests/hash:ip,port,net.t    |   4 +-
 tests/hash:ip,port.t        |  32 ++++----
 tests/hash:ip.t             |  30 +++----
 tests/hash:ip6,mark.t       |   8 +-
 tests/hash:ip6,port,ip6.t   |   8 +-
 tests/hash:ip6,port,net6.t  |   4 +-
 tests/hash:ip6,port.t       |   8 +-
 tests/hash:ip6.t            |  32 ++++----
 tests/hash:mac.t            |  16 ++--
 tests/hash:net,iface.t      |  12 +--
 tests/hash:net,net.t        |  32 ++++----
 tests/hash:net,port,net.t   |   4 +-
 tests/hash:net,port.t       |   8 +-
 tests/hash:net.t            |  16 ++--
 tests/hash:net6,net6.t      |   8 +-
 tests/hash:net6,port,net6.t |   4 +-
 tests/hash:net6,port.t      |  16 ++--
 tests/hash:net6.t           |   8 +-
 tests/ignore.sh             |   2 +-
 tests/iphash.t              |  20 ++---
 tests/ipmap.t               |  28 +++----
 tests/ipmarkhash.t          |   8 +-
 tests/ipporthash.t          |   8 +-
 tests/ipportiphash.t        |   8 +-
 tests/ipportnethash.t       |   8 +-
 tests/iptables.sh           |   8 +-
 tests/iptree.t              |   4 +-
 tests/iptreemap.t           |   4 +-
 tests/macipmap.t            |  16 ++--
 tests/match_target.t        |   2 +-
 tests/nethash.t             |   4 +-
 tests/portmap.t             |  16 ++--
 tests/restore.t             |   2 +-
 tests/runtest.sh            |  52 +++++++++++-
 tests/sendip.py             | 154 ++++++++++++++++++++++++++++++++++++
 tests/sendip.sh             |   8 +-
 tests/setlist.t             |  28 +++----
 tests/setlist_ns.sh         |  29 ++++++-
 tests/setlist_resize.sh     |  34 ++++++--
 tests/sort.sh               |   6 +-
 49 files changed, 541 insertions(+), 283 deletions(-)
 create mode 100755 tests/sendip.py
Signature · 1 line
2.54.0