From adf38fd842575ce4a88aeb1cf57778c90d17c072 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 23 Aug 2023 14:22:15 +0200 Subject: 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. Acked-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/shell/testcases/sets/0036add_set_element_expiration_0 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/shell/testcases/sets/0036add_set_element_expiration_0 b/tests/shell/testcases/sets/0036add_set_element_expiration_0 index 3097d077..12f10074 100755 --- a/tests/shell/testcases/sets/0036add_set_element_expiration_0 +++ b/tests/shell/testcases/sets/0036add_set_element_expiration_0 @@ -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") -- cgit v1.2.3