diff options
| author |  Florian Westphal <fw@strlen.de>
| 2024-05-11 08:48:03 +0200 |
|---|---|---|
| committer |  Jakub Kicinski <kuba@kernel.org>
| 2024-05-13 14:36:26 -0700 |
| commit | 5fcc17dfe05e127a38d24b0e5bf93aaba01fdddc (patch) | |
| tree | 279aefed84e60b58f057fc4ea95f69730cb779e6 /tools/testing | |
| parent | selftests: net: use upstream mtools (diff) | |
| download | linux-5fcc17dfe05e127a38d24b0e5bf93aaba01fdddc.tar.gz linux-5fcc17dfe05e127a38d24b0e5bf93aaba01fdddc.tar.bz2 linux-5fcc17dfe05e127a38d24b0e5bf93aaba01fdddc.zip | |
selftests: netfilter: nft_flowtable.sh: bump socat timeout to 1m
Now that this test runs in netdev CI it looks like 10s isn't enough
for debug kernels:
selftests: net/netfilter: nft_flowtable.sh
2024/05/10 20:33:08 socat[12204] E write(7, 0x563feb16a000, 8192): Broken pipe
FAIL: file mismatch for ns1 -> ns2
-rw------- 1 root root 37345280 May 10 20:32 /tmp/tmp.Am0yEHhNqI
...
Looks like socat gets zapped too quickly, so increase timeout to 1m.
Could also reduce tx file size for KSFT_MACHINE_SLOW, but its preferrable
to have same test for both debug and nondebug.
Signed-off-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20240511064814.561525-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/selftests/net/netfilter/nft_flowtable.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/netfilter/nft_flowtable.sh b/tools/testing/selftests/net/netfilter/nft_flowtable.sh index 86d516e8acd6..b3995550856a 100755 --- a/tools/testing/selftests/net/netfilter/nft_flowtable.sh +++ b/tools/testing/selftests/net/netfilter/nft_flowtable.sh @@ -17,6 +17,7 @@ source lib.sh ret=0 +SOCAT_TIMEOUT=60 nsin="" ns1out="" @@ -350,12 +351,12 @@ test_tcp_forwarding_ip() local dstport=$4 local lret=0 - timeout 10 ip netns exec "$nsb" socat -4 TCP-LISTEN:12345,reuseaddr STDIO < "$nsin" > "$ns2out" & + timeout "$SOCAT_TIMEOUT" ip netns exec "$nsb" socat -4 TCP-LISTEN:12345,reuseaddr STDIO < "$nsin" > "$ns2out" & lpid=$! busywait 1000 listener_ready - timeout 10 ip netns exec "$nsa" socat -4 TCP:"$dstip":"$dstport" STDIO < "$nsin" > "$ns1out" + timeout "$SOCAT_TIMEOUT" ip netns exec "$nsa" socat -4 TCP:"$dstip":"$dstport" STDIO < "$nsin" > "$ns1out" wait $lpid |