summaryrefslogtreecommitdiffstats
path: root/tests/shell/testcases/sets
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2023-08-23 14:22:15 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2023-08-23 19:16:50 +0200
commitadf38fd842575ce4a88aeb1cf57778c90d17c072 (patch)
tree997885a438736d30343f1b5a1bbc4cf9b3ece1e5 /tests/shell/testcases/sets
parentf3769d2f5094c11ca59d83fba3f1decad8d00caf (diff)
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 <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases/sets')
-rwxr-xr-xtests/shell/testcases/sets/0036add_set_element_expiration_08
1 files 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")