tests: redirect: fix tests for upcoming nft-test.py fix

nft-test.py currently fails to properly compare tests involving a set,
after that bug is fixed these lines would fail, so fix this up before.

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/py/ip/masquerade.t b/tests/py/ip/masquerade.t
index 26c3704316ae7467f6fa0de1c1d6a71cc91d2774..384ac72a15f07407177fe8eecfb2f3ec33b669d7 100644 (file)
--- a/tests/py/ip/masquerade.t
+++ b/tests/py/ip/masquerade.t
@@ -27,4 +27,4 @@ ip saddr 10.1.1.1 masquerade drop;fail
 # masquerade with sets
 tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok
 ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter masquerade;ok
-iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok
+iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } masquerade;ok

diff --git a/tests/py/ip/masquerade.t.payload b/tests/py/ip/masquerade.t.payload
index 43ac7f70648afa354256b8ede3e5c518daa7ba81..83351526cce7596e8fa8f8971da3e50e96d4b553 100644 (file)
--- a/tests/py/ip/masquerade.t.payload
+++ b/tests/py/ip/masquerade.t.payload
@@ -109,7 +109,7 @@ ip test-ip4 postrouting
   [ counter pkts 0 bytes 0 ]
   [ masq ]
 
-# iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade
+# iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } masquerade
 __map%d test-ip4 b
 __map%d test-ip4 0
        element 00001600  : 0 [end]     element 0000de00  : 0 [end]

diff --git a/tests/py/ip/redirect.t b/tests/py/ip/redirect.t
index 793236112107a1d666d5d4e23b763129253dd516..d2991ce288b0677861d1ade95a984c1f1059eb2e 100644 (file)
--- a/tests/py/ip/redirect.t
+++ b/tests/py/ip/redirect.t
@@ -44,8 +44,8 @@ ip saddr 10.1.1.1 redirect drop;fail
 # redirect with sets
 tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect;ok
 ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter redirect;ok
-iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect;ok
+iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } redirect;ok
 
 # redirect with maps
-ip protocol 6 redirect to : tcp dport map { 22 : 8000, 80 : 8080};ok
+ip protocol 6 redirect to :tcp dport map { 22 : 8000, 80 : 8080};ok
 

diff --git a/tests/py/ip/redirect.t.payload b/tests/py/ip/redirect.t.payload
index a5d0f0dc111fd4fc0791b35549192ff80611a5c5..f208aacb908776d3ec37e2931b35e00cf05b49d6 100644 (file)
--- a/tests/py/ip/redirect.t.payload
+++ b/tests/py/ip/redirect.t.payload
@@ -191,7 +191,7 @@ ip test-ip4 output
   [ counter pkts 0 bytes 0 ]
   [ redir ]
 
-# iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect
+# iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } redirect
 __map%d test-ip4 b
 __map%d test-ip4 0
        element 00001600  : 0 [end]     element 0000de00  : 0 [end]
@@ -207,7 +207,7 @@ ip test-ip4 output
   [ lookup reg 1 set __map%d dreg 0 ]
   [ redir ]
 
-# ip protocol 6 redirect to : tcp dport map { 22 : 8000, 80 : 8080}
+# ip protocol 6 redirect to :tcp dport map { 22 : 8000, 80 : 8080}
 __map%d test-ip4 b
 __map%d test-ip4 0
         element 00001600  : 0000401f 0 [end]    element 00005000  : 0000901f 0 [end]

diff --git a/tests/py/ip6/masquerade.t b/tests/py/ip6/masquerade.t
index fea739157631c5176b70022986283aa575c3afcb..4eb0467c362e7b2c04a83ca6130e136dbc662f06 100644 (file)
--- a/tests/py/ip6/masquerade.t
+++ b/tests/py/ip6/masquerade.t
@@ -27,4 +27,4 @@ ip6 saddr ::1 masquerade drop;fail
 # masquerade with sets
 tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok
 ip6 daddr fe00::1-fe00::200 udp dport 53 counter masquerade;ok
-iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok
+iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } masquerade;ok

diff --git a/tests/py/ip6/redirect.t b/tests/py/ip6/redirect.t
index 37169bca8fff6bdd36c412adff64401e57980c16..778d53f33ce6e0a112a3a1bb14f589b1b489b020 100644 (file)
--- a/tests/py/ip6/redirect.t
+++ b/tests/py/ip6/redirect.t
@@ -43,7 +43,7 @@ ip6 saddr ::1 redirect drop;fail
 # redirect with sets
 tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect;ok
 ip6 daddr fe00::1-fe00::200 udp dport 53 counter redirect;ok
-iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect;ok
+iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } redirect;ok
 
 # redirect with maps
-ip6 nexthdr 6 redirect to : tcp dport map { 22 : 8000, 80 : 8080};ok
+ip6 nexthdr 6 redirect to :tcp dport map { 22 : 8000, 80 : 8080};ok

diff --git a/tests/py/ip6/redirect.t.payload.ip6 b/tests/py/ip6/redirect.t.payload.ip6
index 8731194f729e02d1deb37fd3834f8f29a8b5d8b1..8f85a57021a89ce1f0a5056d4710fbffffad2a32 100644 (file)
--- a/tests/py/ip6/redirect.t.payload.ip6
+++ b/tests/py/ip6/redirect.t.payload.ip6
@@ -175,7 +175,7 @@ ip6 test-ip6 output
   [ counter pkts 0 bytes 0 ]
   [ redir ]
 
-# iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect
+# iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } redirect
 __map%d test-ip6 b
 __map%d test-ip6 0
        element 00001600  : 0 [end]     element 0000de00  : 0 [end]
@@ -191,7 +191,7 @@ ip6 test-ip6 output
   [ lookup reg 1 set __map%d dreg 0 ]
   [ redir ]
 
-# ip6 nexthdr 6 redirect to : tcp dport map { 22 : 8000, 80 : 8080}
+# ip6 nexthdr 6 redirect to :tcp dport map { 22 : 8000, 80 : 8080}
 __map%d test-ip6 b
 __map%d test-ip6 0
        element 00001600  : 0000401f 0 [end]    element 00005000  : 0000901f 0 [end]