Kernel behaviour changed regarding element reset in sets with timeouts,
disable the offending pieces.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
tests/shell/testcases/sets/reset_command_0 | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/tests/shell/testcases/sets/reset_command_0 b/tests/shell/testcases/sets/reset_command_0
index e663dac831f8c..02d88d291bcf0 100755
--- a/tests/shell/testcases/sets/reset_command_0
+++ b/tests/shell/testcases/sets/reset_command_0
@@ -2,6 +2,10 @@
# NFT_TEST_REQUIRES(NFT_TEST_HAVE_reset_set)
+# Note: Element expiry is no longer reset since kernel commit 4c90bba60c26
+# ("netfilter: nf_tables: do not refresh timeout when resetting element"),
+# the respective parts of the test have therefore been commented out.
+
set -e
trap '[[ $? -eq 0 ]] || echo FAIL' EXIT
@@ -44,10 +48,11 @@ elem='element t s { 1.0.0.1 . udp . 53 }'
grep 'elements = ' | drop_seconds | uniq | wc -l) == 1 ]]
echo OK
-echo -n "counters and expiry are reset: "
+#echo -n "counters and expiry are reset: "
+echo -n "counters are reset: "
NEW=$($NFT "get $elem")
grep -q 'counter packets 0 bytes 0' <<< "$NEW"
-[[ $(expires_minutes <<< "$NEW") -gt 20 ]]
+#[[ $(expires_minutes <<< "$NEW") -gt 20 ]]
echo OK
echo -n "get map elem matches reset map elem: "
@@ -80,11 +85,11 @@ OUT=$($NFT reset map t m)
$DIFF -u <(echo "$EXP") <(echo "$OUT")
echo OK
-echo -n "reset command respects per-element timeout: "
-VAL=$($NFT get element t s '{ 2.0.0.2 . tcp . 22 }' | expires_minutes)
-[[ $VAL -lt 15 ]] # custom timeout applies
-[[ $VAL -gt 10 ]] # expires was reset
-echo OK
+#echo -n "reset command respects per-element timeout: "
+#VAL=$($NFT get element t s '{ 2.0.0.2 . tcp . 22 }' | expires_minutes)
+#[[ $VAL -lt 15 ]] # custom timeout applies
+#[[ $VAL -gt 10 ]] # expires was reset
+#echo OK
echo -n "remaining elements are reset: "
OUT=$($NFT list ruleset)
--
2.41.0
