Commit f581bcf0 authored by Florian Westphal's avatar Florian Westphal Committed by Jakub Kicinski
Browse files

selftests: netfilter: avoid test timeouts on debug kernels 



Jakub reports that some tests fail on netdev CI when executed in a debug
kernel.

Increase test timeout to 30m, this should hopefully be enough.
Also reduce test duration where possible for "slow" machines.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20240429105736.22677-1-fw@strlen.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5cd9fac3

tools/testing/selftests/net/netfilter/br_netfilter.sh

+5 −1
Original line number Diff line number Diff line
@@ -40,7 +40,11 @@ bcast_ping() 
	fromns="$1"

	dstip="$2"



	for i in $(seq 1 500); do

	local packets=500



	[ "$KSFT_MACHINE_SLOW" = yes ] && packets=100



	for i in $(seq 1 $packets); do

		if ! ip netns exec "$fromns" ping -q -f -b -c 1 -q "$dstip" > /dev/null 2>&1; then

			echo "ERROR: ping -b from $fromns to $dstip"

			ip netns exec "$ns0" nft list ruleset

tools/testing/selftests/net/netfilter/nft_nat_zones.sh

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ maxclients=100 
have_socat=0

ret=0



[ "$KSFT_MACHINE_SLOW" = yes ] && maxclients=40

# client1---.

#            veth1-.

#                  |

tools/testing/selftests/net/netfilter/nft_zones_many.sh

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
source lib.sh



zones=2000

[ "$KSFT_MACHINE_SLOW" = yes ] && zones=500



have_ct_tool=0

ret=0
@@ -89,7 +91,7 @@ fi 
		count=$(ip netns exec "$ns1" conntrack -C)

		duration=$((stop-outerstart))



		if [ "$count" -eq "$max_zones" ]; then

		if [ "$count" -ge "$max_zones" ]; then

			echo "PASS: inserted $count entries from packet path in $duration ms total"

		else

			ip netns exec "$ns1" conntrack -S 1>&2

tools/testing/selftests/net/netfilter/settings

+1 −1
Original line number Diff line number Diff line 
timeout=500
 
timeout=1800