diff options
| author | Florian Westphal <fw@strlen.de> | 2025-04-08 16:21:32 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2025-06-22 21:40:40 +0200 |
| commit | 7b21b7e387e30de4c4147c82247655cca608d2fd (patch) | |
| tree | 37d4390cfe185733c8215f6e905248ced9508678 /tests/shell/testcases/sets | |
| parent | 8ff87c8fd483eb3fdab5839cccaf100b593fe92e (diff) | |
tests: shell: add feature check for count output change
New kernels with latest nft release will print the number
of set elements allocated on the kernel side.
This causes shell test dump validation to fail in several
places. We can't just update the affected dump files
because the test cases are also supposed to pass on current
-stable releases.
Add a feature check for this. Dump failure can then use
sed to postprocess the stored dump file and can then call
diff a second time.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/shell/testcases/sets')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/shell/testcases/sets/dumps/0016element_leak_0.nft b/tests/shell/testcases/sets/dumps/0016element_leak_0.nft index 9d2b0afe..debd819d 100644 --- a/tests/shell/testcases/sets/dumps/0016element_leak_0.nft +++ b/tests/shell/testcases/sets/dumps/0016element_leak_0.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 1 elements = { 1.1.1.1 } } } diff --git a/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft b/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft index 9d2b0afe..debd819d 100644 --- a/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft +++ b/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 1 elements = { 1.1.1.1 } } } diff --git a/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft b/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft index 8cd37076..c4b69ef8 100644 --- a/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft +++ b/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 2 elements = { 1.1.1.1, 1.1.1.2 } } } diff --git a/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft b/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft index 8cd37076..c4b69ef8 100644 --- a/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft +++ b/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 2 elements = { 1.1.1.1, 1.1.1.2 } } } diff --git a/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft b/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft index e548a17a..fb9634e6 100644 --- a/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft +++ b/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft @@ -1,7 +1,7 @@ table inet t { set s { type ipv4_addr . inet_service - size 65536 + size 65536 # count 1 flags dynamic,timeout elements = { 192.168.7.1 . 22 } } diff --git a/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft b/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft index de43d565..443ca711 100644 --- a/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft +++ b/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft @@ -1,7 +1,7 @@ table inet filter { set test { type ipv4_addr - size 65535 + size 65535 # count 1 elements = { 1.1.1.1 } } } diff --git a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft index befc2f75..0743453f 100644 --- a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft +++ b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft @@ -1,7 +1,7 @@ table ip x { set y { type ipv4_addr - size 65535 + size 65535 # count 3 flags dynamic counter quota 500 bytes elements = { 1.1.1.1 counter packets 0 bytes 0 quota 500 bytes, |