tests/py: Fix JSON for flowtable tests

Changing the reference lines is not enough, the actual JSON has to be
adjusted as well. Since after the changes output for ip/flowtable.t is
now symmetric, ip/flowtable.t.json.output can be removed.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/py/ip/flowtable.t.json b/tests/py/ip/flowtable.t.json
index 5e11172e772263ea18c396bbab2cb4c443dbba88..1d2b0b7a1a967b6dcfaaede54b9ac4476c1fef74 100644 (file)
--- a/tests/py/ip/flowtable.t.json
+++ b/tests/py/ip/flowtable.t.json
@@ -14,6 +14,7 @@
                 }
             },
             "name": "xyz",
+            "size": 8192,
             "stmt": {
                 "counter": null
             }

diff --git a/tests/py/ip/flowtable.t.json.output b/tests/py/ip/flowtable.t.json.output
deleted file mode 100644 (file)
index 004349a..0000000
--- a/tests/py/ip/flowtable.t.json.output
+++ /dev/null
@@ -1,24 +0,0 @@
-# meter xyz { ip saddr timeout 30s counter}
-[
-    {
-        "meter": {
-            "key": {
-                "elem": {
-                    "timeout": 30,
-                    "val": {
-                        "payload": {
-                            "field": "saddr",
-                            "name": "ip"
-                        }
-                    }
-                }
-            },
-            "name": "xyz",
-           "size": 65535,
-            "stmt": {
-                "counter": null
-            }
-        }
-    }
-]
-

diff --git a/tests/py/ip6/flowtable.t.json b/tests/py/ip6/flowtable.t.json
index 863669eb3b9f7a2b7a6ed16b52707f96ce54ced6..ef33f74d1aaf875783886eb0e42a055d02c9c84d 100644 (file)
--- a/tests/py/ip6/flowtable.t.json
+++ b/tests/py/ip6/flowtable.t.json
@@ -21,6 +21,7 @@
                 }
             },
             "name": "acct_out",
+            "size": 4096,
             "stmt": {
                 "counter": null
             }
@@ -51,6 +52,7 @@
                 }
             },
             "name": "acct_out",
+            "size": 12345,
             "stmt": {
                 "counter": null
             }

diff --git a/tests/py/ip6/flowtable.t.json.output b/tests/py/ip6/flowtable.t.json.output
index f63a2637ebd00d7fccec70ed36bc4ab3f9a18534..ef33f74d1aaf875783886eb0e42a055d02c9c84d 100644 (file)
--- a/tests/py/ip6/flowtable.t.json.output
+++ b/tests/py/ip6/flowtable.t.json.output
@@ -1,4 +1,4 @@
-# meter acct_out { meta iif . ip6 saddr timeout 600s counter }
+# meter acct_out size 4096 { meta iif . ip6 saddr timeout 600s counter }
 [
     {
         "meter": {
@@ -21,7 +21,7 @@
                 }
             },
             "name": "acct_out",
-            "size": 65535,
+            "size": 4096,
             "stmt": {
                 "counter": null
             }
@@ -29,7 +29,7 @@
     }
 ]
 
-# meter acct_out { ip6 saddr . meta iif timeout 600s counter }
+# meter acct_out size 12345 { ip6 saddr . meta iif timeout 600s counter }
 [
     {
         "meter": {
@@ -52,7 +52,7 @@
                 }
             },
             "name": "acct_out",
-            "size": 65535,
+            "size": 12345,
             "stmt": {
                 "counter": null
             }