tests: shell: Stabilize sets/0043concatenated_ranges_0 test

commit c791765cb0d62ba261f0b495e07315437b3ae914 upstream.

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 <phil@nwl.cc>

diff --git a/tests/shell/testcases/sets/0043concatenated_ranges_0 b/tests/shell/testcases/sets/0043concatenated_ranges_0
index 6e8f4000aa4efe9771be6861b54ab549aabef20c..8d3dacf6e38ad8241fd4f6814ea856651d18f5ff 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 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