Skip to contentSkip to conversation

tests: shell: use minutes granularity in sets/0036add_set_element_expiration_0

PATCH In review Pablo Neira Ayuso 2 participants 2 messages Aug 23, 2023 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 tests: shell: use minutes granularity in sets/0036add_set_element_expiration_0

Use minute granularity to fix bogus failures of this test on slow testbed.

---
 .../shell/testcases/sets/0036add_set_element_expiration_0 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tests/shell/testcases/sets/0036add_set_element_expiration_0 +6 -2
index 3097d077506c..12f10074409f 100755
@@ -2,11 +2,15 @@
 
 set -e
 
+drop_seconds() {
+       sed 's/m[0-9]*s[0-9]*ms/m/g'
+}
+
 RULESET="add table ip x
 add set ip x y { type ipv4_addr; flags dynamic,timeout; } 
-add element ip x y { 1.1.1.1 timeout 30s expires 15s }"
+add element ip x y { 1.1.1.1 timeout 30m expires 15m }"
 
-test_output=$($NFT -e -f - <<< "$RULESET" 2>&1 | grep -v '# new generation')
+test_output=$($NFT -e -f - <<< "$RULESET" 2>&1 | grep -v '# new generation' | drop_seconds)
 
 if [ "$test_output" != "$RULESET" ] ; then
 	$DIFF -u <(echo "$test_output") <(echo "$RULESET")
Signature · 1 line
2.30.2