tests: shell: Stabilize sets/0043concatenated_ranges_0 test
Phil Sutter
reviewerPATCH 1/1 tests: shell: Stabilize sets/0043concatenated_ranges_0 test
On a slow system, one of the 'delete element' commands would occasionally fail. Assuming it can only happen if the 2s timeout passes "too quickly", work around it by adding elements with a 2m timeout instead and when wanting to test the element expiry just drop and add the element again with a short timeout.
Fixes 6231d3fa4af1e ("tests: shell: Fix for unstable sets/0043concatenated_ranges_0")
Signed-off-by Phil Sutter <[email protected]>
--- tests/shell/testcases/sets/0043concatenated_ranges_0 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tests/shell/testcases/sets/0043concatenated_ranges_0 +6 -2
@@ -147,7 +147,7 @@ for ta in ${TYPES}; do eval add_b=\$ADD_${tb} eval add_c=\$ADD_${tc} ${NFT} add element inet filter test \ - "{ ${add_a} . ${add_b} . ${add_c} timeout 2s${mapv}}" + "{ ${add_a} . ${add_b} . ${add_c} timeout 2m${mapv}}" [ $(${NFT} list ${setmap} inet filter test | \ grep -c "${add_a} . ${add_b} . ${add_c}") -eq 1 ]
@@ -180,7 +180,11 @@ for ta in ${TYPES}; do continue fi - sleep 2 + ${NFT} delete element inet filter test \ + "{ ${add_a} . ${add_b} . ${add_c} ${mapv}}" + ${NFT} add element inet filter test \ + "{ ${add_a} . ${add_b} . ${add_c} timeout 1s${mapv}}" + sleep 1 [ $(${NFT} list ${setmap} inet filter test | \ grep -c "${add_a} . ${add_b} . ${add_c} ${mapv}") -eq 0 ] timeout_tested=1
Signature · 1 line
2.41.0
Phil Sutter
reviewerQuoted 8 lines · Phil Sutter
On a slow system, one of the 'delete element' commands would occasionally fail. Assuming it can only happen if the 2s timeout passes "too quickly", work around it by adding elements with a 2m timeout instead and when wanting to test the element expiry just drop and add the element again with a short timeout.
Fixes 6231d3fa4af1e ("tests: shell: Fix for unstable sets/0043concatenated_ranges_0")Signed-off-by Phil Sutter <[email protected]>
Patch applied.