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.

Fixes: 618393c6b3f25 ("tests: Introduce test for set with concatenated ranges")
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/tests/shell/testcases/sets/0043concatenated_ranges_0 b/tests/shell/testcases/sets/0043concatenated_ranges_0
index 11767373bcd221f6f37424b26fe36460cdf24cbb..6e8f4000aa4efe9771be6861b54ab549aabef20c 100755 (executable)
--- a/tests/shell/testcases/sets/0043concatenated_ranges_0
+++ b/tests/shell/testcases/sets/0043concatenated_ranges_0
@@ -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