summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2025-07-27 23:50:57 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2025-07-29 03:53:17 +0200
commitcc32d8f4fb8227f71886686d0db29b04e9b883ed (patch)
treeb3a2f90d1da2f35aefcc5ca285d5694ceaa5a334
parent199a63d2e71af03c239a0343e8687b44e20b71ad (diff)
Partial revert in testcase/sets/set_stmt to remove last statement coverage
This last statement is not supported in 1.0.6.y, remove it from 1f3d0b9cf9cc tests: shell: extend coverage for set element statements to make this test pass. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--tests/shell/testcases/sets/dumps/set_stmt.nft37
-rwxr-xr-xtests/shell/testcases/sets/set_stmt1
2 files changed, 8 insertions, 30 deletions
diff --git a/tests/shell/testcases/sets/dumps/set_stmt.nft b/tests/shell/testcases/sets/dumps/set_stmt.nft
index 71ba7996..d403ad4e 100644
--- a/tests/shell/testcases/sets/dumps/set_stmt.nft
+++ b/tests/shell/testcases/sets/dumps/set_stmt.nft
@@ -2,46 +2,29 @@ table ip x {
set y0 {
type ipv4_addr
counter
- elements = { 2.2.2.0 counter packets 3 bytes 4,
- 3.3.3.0 counter packets 1 bytes 2,
- 5.5.5.0 counter packets 1 bytes 2,
- 6.6.6.0 counter packets 3 bytes 4 }
+ elements = { 2.2.2.0 counter packets 3 bytes 4, 3.3.3.0 counter packets 1 bytes 2,
+ 5.5.5.0 counter packets 1 bytes 2, 6.6.6.0 counter packets 3 bytes 4 }
}
set y1 {
type ipv4_addr
limit rate 1/second burst 5 packets
- elements = { 2.2.2.1 limit rate 5/second burst 5 packets,
- 3.3.3.1 limit rate 1/second burst 5 packets,
- 5.5.5.1 limit rate 1/second burst 5 packets,
- 6.6.6.1 limit rate 5/second burst 5 packets }
+ elements = { 2.2.2.1 limit rate 5/second burst 5 packets, 3.3.3.1 limit rate 1/second burst 5 packets,
+ 5.5.5.1 limit rate 1/second burst 5 packets, 6.6.6.1 limit rate 5/second burst 5 packets }
}
set y2 {
type ipv4_addr
ct count over 2
- elements = { 2.2.2.2 ct count over 5,
- 3.3.3.2 ct count over 2,
- 5.5.5.2 ct count over 2,
- 6.6.6.2 ct count over 5 }
- }
-
- set y3 {
- type ipv4_addr
- last
- elements = { 2.2.2.3 last used never,
- 3.3.3.3 last used never,
- 5.5.5.3 last used never,
- 6.6.6.3 last used never }
+ elements = { 2.2.2.2 ct count over 5, 3.3.3.2 ct count over 2,
+ 5.5.5.2 ct count over 2, 6.6.6.2 ct count over 5 }
}
set y4 {
type ipv4_addr
quota over 1000 bytes
- elements = { 2.2.2.4 quota over 30000 bytes used 1000 bytes,
- 3.3.3.4 quota over 1000 bytes,
- 5.5.5.4 quota over 1000 bytes,
- 6.6.6.4 quota over 30000 bytes used 1000 bytes }
+ elements = { 2.2.2.4 quota over 30000 bytes used 1000 bytes, 3.3.3.4 quota over 1000 bytes,
+ 5.5.5.4 quota over 1000 bytes, 6.6.6.4 quota over 30000 bytes used 1000 bytes }
}
chain y0 {
@@ -56,10 +39,6 @@ table ip x {
ip daddr @y2
}
- chain y3 {
- ip daddr @y3
- }
-
chain y4 {
ip daddr @y4
}
diff --git a/tests/shell/testcases/sets/set_stmt b/tests/shell/testcases/sets/set_stmt
index ea50525a..546106a0 100755
--- a/tests/shell/testcases/sets/set_stmt
+++ b/tests/shell/testcases/sets/set_stmt
@@ -44,7 +44,6 @@ test_set_stmt() {
test_set_stmt "0" "counter packets 1 bytes 2" "counter packets 3 bytes 4"
test_set_stmt "1" "limit rate 1/second" "limit rate 5/second"
test_set_stmt "2" "ct count over 2" "ct count over 5"
-test_set_stmt "3" "last" "last"
test_set_stmt "4" "quota over 1000 bytes" "quota over 30000 bytes used 1000 bytes"
exit 0