Skip to content

Commit 06080ea

Browse files
NikAleksandrovdavem330
authored andcommitted
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: 34d7ecb ("selftests: net: bridge: update IGMP/MLD membership interval value") Reported-by: Jakub Kicinski <[email protected]> Signed-off-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8bd67eb commit 06080ea

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,18 +478,18 @@ v3exc_timeout_test()
478478
RET=0
479479
local X=("192.0.2.20" "192.0.2.30")
480480

481-
# GMI should be 3 seconds
481+
# GMI should be 5 seconds
482482
ip link set dev br0 type bridge mcast_query_interval 100 \
483483
mcast_query_response_interval 100 \
484-
mcast_membership_interval 300
484+
mcast_membership_interval 500
485485

486486
v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP
487487
ip link set dev br0 type bridge mcast_query_interval 500 \
488488
mcast_query_response_interval 500 \
489489
mcast_membership_interval 1500
490490

491491
$MZ $h1 -c 1 -b $ALL_MAC -B $ALL_GROUP -t ip "proto=2,p=$MZPKT_ALLOW2" -q
492-
sleep 3
492+
sleep 5
493493
bridge -j -d -s mdb show dev br0 \
494494
| jq -e ".[].mdb[] | \
495495
select(.grp == \"$TEST_GROUP\" and \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,18 +478,18 @@ mldv2exc_timeout_test()
478478
RET=0
479479
local X=("2001:db8:1::20" "2001:db8:1::30")
480480

481-
# GMI should be 3 seconds
481+
# GMI should be 5 seconds
482482
ip link set dev br0 type bridge mcast_query_interval 100 \
483483
mcast_query_response_interval 100 \
484-
mcast_membership_interval 300
484+
mcast_membership_interval 500
485485

486486
mldv2exclude_prepare $h1
487487
ip link set dev br0 type bridge mcast_query_interval 500 \
488488
mcast_query_response_interval 500 \
489489
mcast_membership_interval 1500
490490

491491
$MZ $h1 -c 1 $MZPKT_ALLOW2 -q
492-
sleep 3
492+
sleep 5
493493
bridge -j -d -s mdb show dev br0 \
494494
| jq -e ".[].mdb[] | \
495495
select(.grp == \"$TEST_GROUP\" and \

0 commit comments

Comments
 (0)