Commit 06080ea2 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

selftests: net: bridge: increase IGMP/MLD exclude timeout membership interval 



When running the bridge IGMP/MLD selftests on debug kernels we can get
spurious errors when setting up the IGMP/MLD exclude timeout tests
because the membership interval is just 3 seconds and the setup has 2
seconds of sleep plus various validations, the one second that is left
is not enough. Increase the membership interval from 3 to 5 seconds to
make room for the setup validation and 2 seconds of sleep.

Fixes: 34d7ecb3 ("selftests: net: bridge: update IGMP/MLD membership interval value")
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8bd67ebb

tools/testing/selftests/net/forwarding/bridge_igmp.sh

+3 −3
Original line number Diff line number Diff line
@@ -478,10 +478,10 @@ v3exc_timeout_test() 
	RET=0

	local X=("192.0.2.20" "192.0.2.30")



	# GMI should be 3 seconds

	# GMI should be 5 seconds

	ip link set dev br0 type bridge mcast_query_interval 100 \

					mcast_query_response_interval 100 \

					mcast_membership_interval 300

					mcast_membership_interval 500



	v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP

	ip link set dev br0 type bridge mcast_query_interval 500 \
@@ -489,7 +489,7 @@ v3exc_timeout_test() 
					mcast_membership_interval 1500



	$MZ $h1 -c 1 -b $ALL_MAC -B $ALL_GROUP -t ip "proto=2,p=$MZPKT_ALLOW2" -q

	sleep 3

	sleep 5

	bridge -j -d -s mdb show dev br0 \

		| jq -e ".[].mdb[] | \

			 select(.grp == \"$TEST_GROUP\" and \

tools/testing/selftests/net/forwarding/bridge_mld.sh

+3 −3
Original line number Diff line number Diff line
@@ -478,10 +478,10 @@ mldv2exc_timeout_test() 
	RET=0

	local X=("2001:db8:1::20" "2001:db8:1::30")



	# GMI should be 3 seconds

	# GMI should be 5 seconds

	ip link set dev br0 type bridge mcast_query_interval 100 \

					mcast_query_response_interval 100 \

					mcast_membership_interval 300

					mcast_membership_interval 500



	mldv2exclude_prepare $h1

	ip link set dev br0 type bridge mcast_query_interval 500 \
@@ -489,7 +489,7 @@ mldv2exc_timeout_test() 
					mcast_membership_interval 1500



	$MZ $h1 -c 1 $MZPKT_ALLOW2 -q

	sleep 3

	sleep 5

	bridge -j -d -s mdb show dev br0 \

		| jq -e ".[].mdb[] | \

			 select(.grp == \"$TEST_GROUP\" and \