Commit c273289f authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

selftests: netfilter: fix transaction test script timeout handling 



The kselftest framework uses a default timeout of 45 seconds for
all test scripts.

Increase the timeout to two minutes for the netfilter tests, this
should hopefully be enough,

Make sure that, should the script be canceled, the net namespace and
the spawned ping instances are removed.

Fixes: 25d8bced ("selftests: add script to stress-test nft packet path vs. control plane")
Reported-by: default avatarMirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Tested-by: default avatarMirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8fed7565

tools/testing/selftests/netfilter/nft_trans_stress.sh

+9 −7
Original line number Diff line number Diff line
@@ -10,12 +10,20 @@ 
ksft_skip=4



testns=testns-$(mktemp -u "XXXXXXXX")

tmp=""



tables="foo bar baz quux"

global_ret=0

eret=0

lret=0



cleanup() {

	ip netns pids "$testns" | xargs kill 2>/dev/null

	ip netns del "$testns"



	rm -f "$tmp"

}



check_result()

{

	local r=$1
@@ -43,6 +51,7 @@ if [ $? -ne 0 ];then 
	exit $ksft_skip

fi



trap cleanup EXIT

tmp=$(mktemp)



for table in $tables; do
@@ -139,11 +148,4 @@ done 


check_result $lret "add/delete with nftrace enabled"



pkill -9 ping



wait



rm -f "$tmp"

ip netns del "$testns"



exit $global_ret

tools/testing/selftests/netfilter/settings

0 → 100644
+1 −0
Original line number Diff line number Diff line 
timeout=120