tests: ct, meta: fixes 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/any/ct.t b/tests/py/any/ct.t
index 9c88140e4772f278ca12bf36d73bf7ff2ed52aa1..6334dd760b5632ea17255f49333b7c22ce292699 100644 (file)
--- a/tests/py/any/ct.t
+++ b/tests/py/any/ct.t
@@ -69,9 +69,9 @@ ct expiration != 233;ok;ct expiration != 3m53s
 ct expiration 33-45;ok;ct expiration 33s-45s
 ct expiration != 33-45;ok;ct expiration != 33s-45s
 ct expiration {33, 55, 67, 88};ok;ct expiration { 1m7s, 33s, 55s, 1m28s}
-ct expiration != {33, 55, 67, 88};ok;ct expiration { 1m7s, 33s, 55s, 1m28s}
+ct expiration != {33, 55, 67, 88};ok;ct expiration != { 1m7s, 33s, 55s, 1m28s}
 ct expiration {33-55};ok;ct expiration { 33s-55s}
-ct expiration != {33-55};ok; ct expiration != { 33s-55s}
+ct expiration != {33-55};ok;ct expiration != { 33s-55s}
 
 ct helper "ftp";ok
 ct helper "12345678901234567";fail

diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index 3165ef2cd0b9051672d262d467ed6794e3ab7426..9df038e510f42fe0889321f70b097928b828eb01 100644 (file)
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -66,14 +66,14 @@ meta iif != "lo" accept;ok;iif != "lo" accept
 
 meta iifname "dummy0";ok;iifname "dummy0"
 meta iifname != "dummy0";ok;iifname != "dummy0"
-meta iifname {"dummy0", "lo"};ok
-meta iifname != {"dummy0", "lo"};ok
+meta iifname {"dummy0", "lo"};ok;iifname {"dummy0", "lo"}
+meta iifname != {"dummy0", "lo"};ok;iifname != {"dummy0", "lo"}
 meta iifname "dummy*";ok;iifname "dummy*"
 meta iifname "dummy\*";ok;iifname "dummy\*"
 meta iifname '""';fail
 
-meta iiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok
-meta iiftype != {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok
+meta iiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok;iiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre}
+meta iiftype != {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok;iiftype != {ether, ppp, ipip, ipip6, loopback, sit, ipgre}
 meta iiftype != ether;ok;iiftype != ether
 meta iiftype ether;ok;iiftype ether
 meta iiftype != ppp;ok;iiftype != ppp
@@ -81,18 +81,18 @@ meta iiftype ppp;ok;iiftype ppp
 
 meta oif "lo" accept;ok;oif "lo" accept
 meta oif != "lo" accept;ok;oif != "lo" accept
-meta oif {"lo"} accept;ok
-meta oif != {"lo"} accept;ok
+meta oif {"lo"} accept;ok;oif {"lo"} accept
+meta oif != {"lo"} accept;ok;oif != {"lo"} accept
 
 meta oifname "dummy0";ok;oifname "dummy0"
 meta oifname != "dummy0";ok;oifname != "dummy0"
-meta oifname { "dummy0", "lo"};ok
+meta oifname { "dummy0", "lo"};ok;oifname { "dummy0", "lo"}
 meta oifname "dummy*";ok;oifname "dummy*"
 meta oifname "dummy\*";ok;oifname "dummy\*"
 meta oifname '""';fail
 
-meta oiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok
-meta oiftype != {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok
+meta oiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok;oiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre}
+meta oiftype != {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok;oiftype != {ether, ppp, ipip, ipip6, loopback, sit, ipgre}
 meta oiftype != ether;ok;oiftype != ether
 meta oiftype ether;ok;oiftype ether
 
@@ -106,7 +106,7 @@ meta skuid eq 3000 accept;ok;skuid 3000 accept
 meta skuid 3001-3005 accept;ok;skuid 3001-3005 accept
 meta skuid != 2001-2005 accept;ok;skuid != 2001-2005 accept
 meta skuid { 2001-2005} accept;ok;skuid { 2001-2005} accept
-meta skuid != { 2001-2005} accept;ok
+meta skuid != { 2001-2005} accept;ok;skuid != { 2001-2005} accept
 
 meta skgid {"bin", "root", "daemon"} accept;ok;skgid { 0, 1, 2} accept
 meta skgid != {"bin", "root", "daemon"} accept;ok;skgid != { 1, 0, 2} accept
@@ -159,36 +159,36 @@ meta pkttype != broadcast;ok;pkttype != broadcast
 meta pkttype != host;ok;pkttype != host
 meta pkttype != multicast;ok;pkttype != multicast
 meta pkttype broadcastttt;fail
-meta pkttype { broadcast, multicast} accept;ok
+pkttype { broadcast, multicast} accept;ok
 
 meta cpu 1;ok;cpu 1
 meta cpu != 1;ok;cpu != 1
 meta cpu 1-3;ok;cpu 1-3
 meta cpu != 1-2;ok;cpu != 1-2
 meta cpu { 2,3};ok;cpu { 2,3}
-meta cpu { 2-3, 5-7};ok
-meta cpu != { 2,3};ok; cpu != { 2,3}
+meta cpu { 2-3, 5-7};ok;cpu { 2-3, 5-7}
+meta cpu != { 2,3};ok;cpu != { 2,3}
 
 meta iifgroup 0;ok;iifgroup "default"
 meta iifgroup != 0;ok;iifgroup != "default"
 meta iifgroup "default";ok;iifgroup "default"
 meta iifgroup != "default";ok;iifgroup != "default"
 meta iifgroup {"default"};ok;iifgroup {"default"}
-meta iifgroup != {"default"};ok
-meta iifgroup { 11,33};ok
-meta iifgroup {11-33};ok
-meta iifgroup != { 11,33};ok
-meta iifgroup != {11-33};ok
+meta iifgroup != {"default"};ok;iifgroup != {"default"}
+meta iifgroup { 11,33};ok;iifgroup { 11,33}
+meta iifgroup {11-33};ok;iifgroup {11-33}
+meta iifgroup != { 11,33};ok;iifgroup != { 11,33}
+meta iifgroup != {11-33};ok;iifgroup != {11-33}
 meta oifgroup 0;ok;oifgroup "default"
 meta oifgroup != 0;ok;oifgroup != "default"
 meta oifgroup "default";ok;oifgroup "default"
 meta oifgroup != "default";ok;oifgroup != "default"
 meta oifgroup {"default"};ok;oifgroup {"default"}
 meta oifgroup != {"default"};ok;oifgroup != {"default"}
-meta oifgroup { 11,33};ok
-meta oifgroup {11-33};ok
-meta oifgroup != { 11,33};ok
-meta oifgroup != {11-33};ok
+meta oifgroup { 11,33};ok;oifgroup { 11,33}
+meta oifgroup {11-33};ok;oifgroup {11-33}
+meta oifgroup != { 11,33};ok;oifgroup != { 11,33}
+meta oifgroup != {11-33};ok;oifgroup != {11-33}
 
 meta cgroup 1048577;ok;cgroup 1048577
 meta cgroup != 1048577;ok;cgroup != 1048577
@@ -199,9 +199,9 @@ meta cgroup != 1048577-1048578;ok;cgroup != 1048577-1048578
 meta cgroup {1048577-1048578};ok;cgroup { 1048577-1048578}
 meta cgroup != { 1048577-1048578};ok;cgroup != { 1048577-1048578}
 
-meta iif . meta oif { "lo" . "lo" };ok
-meta iif . meta oif . meta mark { "lo" . "lo" . 0x0000000a };ok
-meta iif . meta oif vmap { "lo" . "lo" : drop };ok
+meta iif . meta oif { "lo" . "lo" };ok;iif . oif { "lo" . "lo" }
+meta iif . meta oif . meta mark { "lo" . "lo" . 0x0000000a };ok;iif . oif . mark { "lo" . "lo" . 0x0000000a }
+meta iif . meta oif vmap { "lo" . "lo" : drop };ok;iif . oif vmap { "lo" . "lo" : drop }
 
 meta random eq 1;ok;meta random 1
 meta random gt 1000000;ok;meta random > 1000000

diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index 21c6cdd37e9c079f3615a7ad47b54d7df4758c74..b32770f508e7cfca8869dbaa02e99e9e90d7f8c2 100644 (file)
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -650,7 +650,7 @@ ip test-ip4 input
   [ meta load pkttype => reg 1 ]
   [ cmp neq reg 1 0x00000002 ]
 
-# meta pkttype { broadcast, multicast} accept
+# pkttype { broadcast, multicast} accept
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000001  : 0 [end]     element 00000002  : 0 [end]