From 5edf80a14b8e3eafa3fbcef073f87e04da5264db Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Fri, 7 Jun 2019 19:25:24 +0200
Subject: tests/py: Fix JSON equivalents

Recent patch removing single element set use missed to adjust JSON
equivalents accordingly.

Fixes: 27f6a4c68b4fd ("tests: replace single element sets")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/py/any/ct.t.json | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'tests/py/any/ct.t.json')

diff --git a/tests/py/any/ct.t.json b/tests/py/any/ct.t.json
index 45e48f22..7c16f9df 100644
--- a/tests/py/any/ct.t.json
+++ b/tests/py/any/ct.t.json
@@ -883,7 +883,7 @@
     }
 ]
 
-# ct expiration {33-55}
+# ct expiration {33-55, 66-88}
 [
     {
         "match": {
@@ -895,16 +895,15 @@
             "op": "==",
             "right": {
                 "set": [
-                    {
-                        "range": [ 33, 55 ]
-                    }
+                    { "range": [ 33, 55 ] },
+                    { "range": [ 66, 88 ] }
                 ]
             }
         }
     }
 ]
 
-# ct expiration != {33-55}
+# ct expiration != {33-55, 66-88}
 [
     {
         "match": {
@@ -916,9 +915,8 @@
             "op": "!=",
             "right": {
                 "set": [
-                    {
-                        "range": [ 33, 55 ]
-                    }
+                    { "range": [ 33, 55 ] },
+                    { "range": [ 66, 88 ] }
                 ]
             }
         }
@@ -1003,7 +1001,7 @@
     }
 ]
 
-# ct direction . ct mark { original . 0x12345678}
+# ct direction . ct mark { original . 0x12345678, reply . 0x87654321}
 [
     {
         "match": {
@@ -1029,6 +1027,12 @@
                             "original",
                             "0x12345678"
                         ]
+                    },
+                    {
+                        "concat": [
+                            "reply",
+                            "0x87654321"
+                        ]
                     }
                 ]
             }
@@ -1036,7 +1040,7 @@
     }
 ]
 
-# ct state . ct mark vmap { new . 0x12345678 : drop}
+# ct state . ct mark vmap { new . 0x12345678 : drop, established . 0x87654321 : accept}
 [
     {
         "vmap": {
@@ -1066,6 +1070,17 @@
                         {
                             "drop": null
                         }
+                    ],
+                    [
+                        {
+                            "concat": [
+                                "established",
+                                "0x87654321"
+                            ]
+                        },
+                        {
+                            "accept": null
+                        }
                     ]
                 ]
             }
-- 
cgit v1.2.3