|
 |
cf8614 |
From e8300966510001e38f2b6530607bac2a93de5c2e Mon Sep 17 00:00:00 2001
|
|
|
cf8614 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
cf8614 |
Date: Mon, 2 Aug 2021 14:35:08 +0200
|
|
|
cf8614 |
Subject: [PATCH] tests: shell: Fix bogus testsuite failure with 100Hz
|
|
|
cf8614 |
|
|
|
cf8614 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1919203
|
|
|
cf8614 |
Upstream Status: nftables commit c9c5b5f621c37
|
|
|
cf8614 |
|
|
|
cf8614 |
commit c9c5b5f621c37d17140dac682d211825ef321093
|
|
|
cf8614 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
cf8614 |
Date: Mon Jul 26 15:27:32 2021 +0200
|
|
|
cf8614 |
|
|
|
cf8614 |
tests: shell: Fix bogus testsuite failure with 100Hz
|
|
|
cf8614 |
|
|
|
cf8614 |
On kernels with CONFIG_HZ=100, clock granularity does not allow tracking
|
|
|
cf8614 |
timeouts in single digit ms range. Change sets/0031set_timeout_size_0 to
|
|
|
cf8614 |
not expose this detail.
|
|
|
cf8614 |
|
|
|
cf8614 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
cf8614 |
Acked-by: Florian Westphal <fw@strlen.de>
|
|
|
cf8614 |
---
|
|
|
cf8614 |
tests/shell/testcases/sets/0031set_timeout_size_0 | 4 ++--
|
|
|
cf8614 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
cf8614 |
|
|
|
cf8614 |
diff --git a/tests/shell/testcases/sets/0031set_timeout_size_0 b/tests/shell/testcases/sets/0031set_timeout_size_0
|
|
|
cf8614 |
index 9edd5f6..796640d 100755
|
|
|
cf8614 |
--- a/tests/shell/testcases/sets/0031set_timeout_size_0
|
|
|
cf8614 |
+++ b/tests/shell/testcases/sets/0031set_timeout_size_0
|
|
|
cf8614 |
@@ -3,10 +3,10 @@
|
|
|
cf8614 |
RULESET="add table x
|
|
|
cf8614 |
add set x y { type ipv4_addr; size 128; timeout 30s; flags dynamic; }
|
|
|
cf8614 |
add chain x test
|
|
|
cf8614 |
-add rule x test set update ip saddr timeout 1d2h3m4s8ms @y
|
|
|
cf8614 |
+add rule x test set update ip saddr timeout 1d2h3m4s10ms @y
|
|
|
cf8614 |
add rule x test set update ip daddr timeout 100ms @y"
|
|
|
cf8614 |
|
|
|
cf8614 |
set -e
|
|
|
cf8614 |
$NFT -f - <<< "$RULESET"
|
|
|
cf8614 |
-$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s8ms }'
|
|
|
cf8614 |
+$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s10ms }'
|
|
|
cf8614 |
$NFT list chain x test | grep -q 'update @y { ip daddr timeout 100ms }'
|
|
|
cf8614 |
--
|
|
|
cf8614 |
2.31.1
|
|
|
cf8614 |
|