tests: shell: Fix for unstable sets/0043concatenated_ranges_0
Phil Sutter
reviewerPATCH 1/1 tests: shell: Fix for unstable sets/0043concatenated_ranges_0
On my (slow?) testing VM, The test tends to fail when doing a full run (i.e., calling run-test.sh without arguments) and tends to pass when run individually.
The problem seems to be the 1s element timeout which in some cases may pass before element deletion occurs. Simply fix this by doubling the timeout. It has to pass just once, so shouldn't hurt too much.
--- tests/shell/testcases/sets/0043concatenated_ranges_0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/shell/testcases/sets/0043concatenated_ranges_0 +2 -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 1s${mapv}}" + "{ ${add_a} . ${add_b} . ${add_c} timeout 2s${mapv}}" [ $(${NFT} list ${setmap} inet filter test | \ grep -c "${add_a} . ${add_b} . ${add_c}") -eq 1 ]
@@ -180,7 +180,7 @@ for ta in ${TYPES}; do continue fi - sleep 1 + sleep 2 [ $(${NFT} list ${setmap} inet filter test | \ grep -c "${add_a} . ${add_b} . ${add_c} ${mapv}") -eq 0 ] timeout_tested=1
Signature · 1 line
2.40.0
Quoted 6 lines · On Thu, 20 Apr 2023 17:47:23 +0200 Phil Sutter <[email protected]> wrote:
On my (slow?) testing VM, The test tends to fail when doing a full run (i.e., calling
run-test.shwithout arguments) and tends to pass when run individually.The problem seems to be the 1s element timeout which in some cases may pass before element deletion occurs.
Whoops. Yes I think so too.
Quoted 6 lines
Simply fix this by doubling the
timeout. It has to pass just once, so shouldn't hurt too much.Fixes 618393c6b3f25 ("tests: Introduce test for set with concatenated ranges")Cc Stefano Brivio <[email protected]>Signed-off-by Phil Sutter <[email protected]>
Signature · 1 line
Stefano
Pablo Neira Ayuso
maintainerQuoted 7 lines · Phil Sutter
On my (slow?) testing VM, The test tends to fail when doing a full run (i.e., calling
run-test.shwithout arguments) and tends to pass when run individually.The problem seems to be the 1s element timeout which in some cases may pass before element deletion occurs. Simply fix this by doubling the timeout. It has to pass just once, so shouldn't hurt too much.
I have seen this with CONFIG_KASAN too, thanks Phil.
Quoted 32 lines
Fixes 618393c6b3f25 ("tests: Introduce test for set with concatenated ranges")Cc Stefano Brivio <[email protected]>Signed-off-by Phil Sutter <[email protected]>--- tests/shell/testcases/sets/0043concatenated_ranges_0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tests/shell/testcases/sets/0043concatenated_ranges_0 +2
-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 1s${mapv}}" + "{ ${add_a} . ${add_b} . ${add_c} timeout 2s${mapv}}" [ $(${NFT} list ${setmap} inet filter test | \ grep -c "${add_a} . ${add_b} . ${add_c}") -eq 1 ]@@ -180,7 +180,7 @@ for ta in ${TYPES}; do continue fi - sleep 1 + sleep 2 [ $(${NFT} list ${setmap} inet filter test | \ grep -c "${add_a} . ${add_b} . ${add_c} ${mapv}") -eq 0 ] timeout_tested=1Signature · 1 line
2.40.0
Phil Sutter
reviewerQuoted 11 lines · Phil Sutter
On my (slow?) testing VM, The test tends to fail when doing a full run (i.e., calling
run-test.shwithout arguments) and tends to pass when run individually.The problem seems to be the 1s element timeout which in some cases may pass before element deletion occurs. Simply fix this by doubling the timeout. It has to pass just once, so shouldn't hurt too much.
Fixes 618393c6b3f25 ("tests: Introduce test for set with concatenated ranges")Cc Stefano Brivio <[email protected]>Signed-off-by Phil Sutter <[email protected]>
Patch applied.