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@xxxxxxxxx>
---
tests/py/ip/masquerade.t | 2 +-
tests/py/ip/redirect.t | 4 ++--
tests/py/ip/redirect.t.payload | 2 +-
tests/py/ip6/masquerade.t | 2 +-
tests/py/ip6/redirect.t | 4 ++--
tests/py/ip6/redirect.t.payload.ip6 | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/py/ip/masquerade.t b/tests/py/ip/masquerade.t
index 26c3704316ae..41f0e98aa6fb 100644
--- 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 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
diff --git a/tests/py/ip/redirect.t b/tests/py/ip/redirect.t
index 793236112107..6cef0830cd50 100644
--- 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 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
# 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 a5d0f0dc111f..4c75e5056f72 100644
--- a/tests/py/ip/redirect.t.payload
+++ b/tests/py/ip/redirect.t.payload
@@ -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 fea739157631..57713ff1115f 100644
--- 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 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
diff --git a/tests/py/ip6/redirect.t b/tests/py/ip6/redirect.t
index 37169bca8fff..de3410c3b374 100644
--- 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 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
# 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 8731194f729e..77ebf087b2db 100644
--- a/tests/py/ip6/redirect.t.payload.ip6
+++ b/tests/py/ip6/redirect.t.payload.ip6
@@ -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]
--
2.16.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
