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>

diff --git a/tests/shell/features/setcount.sh b/tests/shell/features/setcount.sh
new file mode 100755 (executable)
index 0000000..9c2f75c
--- /dev/null
+++ b/tests/shell/features/setcount.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+$NFT -f - <<EOF
+table ip t {
+       set s {
+               type ipv4_addr
+               size 2
+               elements = { 1.2.3.4 }
+       }
+}
+EOF
+
+$NFT list set ip t s | grep -q 'size 2 # count 1'

diff --git a/tests/shell/helpers/test-wrapper.sh b/tests/shell/helpers/test-wrapper.sh
index 6ec4e0301ca4ad4835f99d4adfa931af7398a18f..cef38a59b776c3d294cc1227560a56258c7a50fd 100755 (executable)
--- a/tests/shell/helpers/test-wrapper.sh
+++ b/tests/shell/helpers/test-wrapper.sh
@@ -5,6 +5,8 @@
 #
 # For some printf debugging, you can also patch this file.
 
+rc_dump=0
+
 array_contains() {
        local needle="$1"
        local a
@@ -25,6 +27,29 @@ show_file() {
        printf "<<<<\n"
 }
 
+diff_check_setcount() {
+       local dumpfile="$1"
+       local after="$2"
+
+       if $DIFF -u "$dumpfile" "$after" &> "$NFT_TEST_TESTTMPDIR/ruleset-diff" ; then
+               rm -f "$NFT_TEST_TESTTMPDIR/ruleset-diff"
+               return
+       fi
+
+       if [ $NFT_TEST_HAVE_setcount = n ];then
+               # old kernel or nft binary, expect "size 42", not "size 42      # count 1".
+               sed s/.\#\ count\ .\*//g "$dumpfile" > "$NFT_TEST_TESTTMPDIR/ruleset-diff-postprocess"
+
+               if $DIFF -u "$NFT_TEST_TESTTMPDIR/ruleset-diff-postprocess" "$after" > /dev/null ; then
+                       rm -f "$NFT_TEST_TESTTMPDIR/ruleset-diff" "$NFT_TEST_TESTTMPDIR/ruleset-diff-postprocess"
+                       return
+               fi
+       fi
+
+       show_file "$NFT_TEST_TESTTMPDIR/ruleset-diff" "Failed \`$DIFF -u \"$dumpfile\" \"$after\"\`" >> "$NFT_TEST_TESTTMPDIR/rc-failed-dump"
+       rc_dump=1
+}
+
 json_pretty() {
        "$NFT_TEST_BASEDIR/helpers/json-pretty.sh" "$@" 2>&1 || :
 }
@@ -196,15 +221,9 @@ if [ "$rc_test" -eq 0 -a '(' "$DUMPGEN" = all -o "$DUMPGEN" = y ')' ] ; then
        fi
 fi
 
-rc_dump=0
 if [ "$rc_test" -ne 77 -a "$dump_written" != y ] ; then
        if [ -f "$DUMPFILE" ] ; then
-               if ! $DIFF -u "$DUMPFILE" "$NFT_TEST_TESTTMPDIR/ruleset-after" &> "$NFT_TEST_TESTTMPDIR/ruleset-diff" ; then
-                       show_file "$NFT_TEST_TESTTMPDIR/ruleset-diff" "Failed \`$DIFF -u \"$DUMPFILE\" \"$NFT_TEST_TESTTMPDIR/ruleset-after\"\`" >> "$NFT_TEST_TESTTMPDIR/rc-failed-dump"
-                       rc_dump=1
-               else
-                       rm -f "$NFT_TEST_TESTTMPDIR/ruleset-diff"
-               fi
+               diff_check_setcount "$DUMPFILE" "$NFT_TEST_TESTTMPDIR/ruleset-after"
        fi
        if [ "$NFT_TEST_HAVE_json" != n -a -f "$JDUMPFILE" ] ; then
                if ! $DIFF -u "$JDUMPFILE" "$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty" &> "$NFT_TEST_TESTTMPDIR/ruleset-diff.json" ; then

diff --git a/tests/shell/testcases/rule_management/0011reset_0 b/tests/shell/testcases/rule_management/0011reset_0
index 2004b17d5822d4503cbff875248f7d0a8abd9ad1..5e65ced946e52bbde4105c4c3d663d681294f714 100755 (executable)
--- a/tests/shell/testcases/rule_management/0011reset_0
+++ b/tests/shell/testcases/rule_management/0011reset_0
@@ -4,6 +4,12 @@
 
 set -e
 
+if [ $NFT_TEST_HAVE_setcount = y ]; then
+       size="size 65535        # count 1"
+else
+       size="size 65535"
+fi
+
 echo "loading ruleset with anonymous set"
 $NFT -f - <<EOF
 table t {
@@ -60,10 +66,10 @@ EOF
 echo "resetting specific rule"
 handle=$($NFT -a list chain t c | sed -n 's/.*accept # handle \([0-9]*\)$/\1/p')
 $NFT reset rule t c handle $handle
-EXPECT='table ip t {
+EXPECT="table ip t {
        set s {
                type ipv4_addr
-               size 65535
+               $size
                flags dynamic
                counter
                elements = { 1.1.1.1 counter packets 1 bytes 11 }
@@ -90,7 +96,7 @@ table ip t2 {
                counter packets 7 bytes 17 accept
                counter packets 8 bytes 18 drop
        }
-}'
+}"
 $DIFF -u <(echo "$EXPECT") <($NFT list ruleset)
 
 echo "resetting specific chain"
@@ -103,10 +109,10 @@ EXPECT='table ip t {
 $DIFF -u <(echo "$EXPECT") <($NFT reset rules chain t c2)
 
 echo "resetting specific table"
-EXPECT='table ip t {
+EXPECT="table ip t {
        set s {
                type ipv4_addr
-               size 65535
+               $size
                flags dynamic
                counter
                elements = { 1.1.1.1 counter packets 1 bytes 11 }
@@ -121,14 +127,14 @@ EXPECT='table ip t {
                counter packets 0 bytes 0 accept
                counter packets 0 bytes 0 drop
        }
-}'
+}"
 $DIFF -u <(echo "$EXPECT") <($NFT reset rules table t)
 
 echo "resetting specific family"
-EXPECT='table ip t {
+EXPECT="table ip t {
        set s {
                type ipv4_addr
-               size 65535
+               $size
                flags dynamic
                counter
                elements = { 1.1.1.1 counter packets 1 bytes 11 }
@@ -149,14 +155,14 @@ table ip t2 {
                counter packets 7 bytes 17 accept
                counter packets 8 bytes 18 drop
        }
-}'
+}"
 $DIFF -u <(echo "$EXPECT") <($NFT reset rules ip)
 
 echo "resetting whole ruleset"
-EXPECT='table ip t {
+EXPECT="table ip t {
        set s {
                type ipv4_addr
-               size 65535
+               $size
                flags dynamic
                counter
                elements = { 1.1.1.1 counter packets 1 bytes 11 }
@@ -183,5 +189,5 @@ table ip t2 {
                counter packets 0 bytes 0 accept
                counter packets 0 bytes 0 drop
        }
-}'
+}"
 $DIFF -u <(echo "$EXPECT") <($NFT reset rules)

diff --git a/tests/shell/testcases/rule_management/dumps/0011reset_0.nft b/tests/shell/testcases/rule_management/dumps/0011reset_0.nft
index 3b4f5a11a96ee91c3df7e6b2d09eae11b734161f..3c29b582355d1024fddc137f53fb4efaeb29fc9e 100644 (file)
--- a/tests/shell/testcases/rule_management/dumps/0011reset_0.nft
+++ b/tests/shell/testcases/rule_management/dumps/0011reset_0.nft
@@ -1,7 +1,7 @@
 table ip t {
        set s {
                type ipv4_addr
-               size 65535
+               size 65535      # count 1
                flags dynamic
                counter
                elements = { 1.1.1.1 counter packets 1 bytes 11 }

diff --git a/tests/shell/testcases/sets/dumps/0016element_leak_0.nft b/tests/shell/testcases/sets/dumps/0016element_leak_0.nft
index 9d2b0afed4255965aa8313aae7b5d2815b3c70ab..debd819dfc2bdef2fc79722824a05b4c3f961e50 100644 (file)
--- 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 9d2b0afed4255965aa8313aae7b5d2815b3c70ab..debd819dfc2bdef2fc79722824a05b4c3f961e50 100644 (file)
--- 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 8cd3707607b3438ab3272b37df79446d1ba782cc..c4b69ef8e40991fb5bf2ed710908f3520d53320f 100644 (file)
--- 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 8cd3707607b3438ab3272b37df79446d1ba782cc..c4b69ef8e40991fb5bf2ed710908f3520d53320f 100644 (file)
--- 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 e548a17a142d8a7a0db4297cb3ebc0f9c72a27bb..fb9634e685d3205e3e02728c3d71ac8157c9af46 100644 (file)
--- 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 de43d565084ba70383d7e6ad72e4a34b59525ac7..443ca7110f4f7138ba75bb115a228cff02db6591 100644 (file)
--- 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 befc2f75bd42d4192c734d9f49a3a0f14048c1fd..0743453f62e045aa5a6cce0387735c7d7ed1d925 100644 (file)
--- 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,