diff options
author | Florian Westphal <fw@strlen.de> | 2021-06-03 22:45:13 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2021-06-07 22:50:55 +0200 |
commit | ec1ea13314fa55e43e3034bf43297829b25ba582 (patch) | |
tree | 9bcb6f874abd1672abc46c1cbf13765ef6753681 /tests/py/any | |
parent | f98185fd18079cbf4041c24c47a6111fc873a7bc (diff) |
tests: remove redundant test cases
Check for
... 23-42 ...
... { 23-42 } ...
and remove the latter. Followup patch will translate the former to the
latter during evaluation step to avoid the unneded anon set.
A separate test case will be added that checks for such rewrites.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/any')
-rw-r--r-- | tests/py/any/meta.t | 4 | ||||
-rw-r--r-- | tests/py/any/meta.t.json | 40 | ||||
-rw-r--r-- | tests/py/any/meta.t.payload | 38 |
3 files changed, 0 insertions, 82 deletions
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t index 0b894cce..125b0a3f 100644 --- a/tests/py/any/meta.t +++ b/tests/py/any/meta.t @@ -115,8 +115,6 @@ meta skgid gt 3000 accept;ok;meta skgid > 3000 accept meta skgid eq 3000 accept;ok;meta skgid 3000 accept meta skgid 2001-2005 accept;ok meta skgid != 2001-2005 accept;ok -meta skgid { 2001-2005} accept;ok -meta skgid != { 2001-2005} accept;ok # BUG: meta nftrace 2 and meta nftrace 1 # $ sudo nft add rule ip test input meta nftrace 2 @@ -194,8 +192,6 @@ meta cgroup { 1048577, 1048578 };ok meta cgroup != { 1048577, 1048578};ok meta cgroup 1048577-1048578;ok meta cgroup != 1048577-1048578;ok -meta cgroup {1048577-1048578};ok -meta cgroup != { 1048577-1048578};ok meta iif . meta oif { "lo" . "lo" };ok;iif . oif { "lo" . "lo" } meta iif . meta oif . meta mark { "lo" . "lo" . 0x0000000a };ok;iif . oif . meta mark { "lo" . "lo" . 0x0000000a } diff --git a/tests/py/any/meta.t.json b/tests/py/any/meta.t.json index 1a98843c..fd4d1c2a 100644 --- a/tests/py/any/meta.t.json +++ b/tests/py/any/meta.t.json @@ -1476,46 +1476,6 @@ } ] -# meta skgid { 2001-2005} accept -[ - { - "match": { - "left": { - "meta": { "key": "skgid" } - }, - "op": "==", - "right": { - "set": [ - { "range": [ 2001, 2005 ] } - ] - } - } - }, - { - "accept": null - } -] - -# meta skgid != { 2001-2005} accept -[ - { - "match": { - "left": { - "meta": { "key": "skgid" } - }, - "op": "!=", - "right": { - "set": [ - { "range": [ 2001, 2005 ] } - ] - } - } - }, - { - "accept": null - } -] - # meta mark set 0xffffffc8 xor 0x16 [ { diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload index 4e43905e..b79a0255 100644 --- a/tests/py/any/meta.t.payload +++ b/tests/py/any/meta.t.payload @@ -961,44 +961,6 @@ ip test-ip4 input [ meta load oifgroup => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] -# meta skgid { 2001-2005} accept -__set%d test-ip4 7 size 3 -__set%d test-ip4 0 - element 00000000 : 1 [end] element d1070000 : 0 [end] element d6070000 : 1 [end] -ip test-ip4 input - [ meta load skgid => reg 1 ] - [ byteorder reg 1 = hton(reg 1, 4, 4) ] - [ lookup reg 1 set __set%d ] - [ immediate reg 0 accept ] - -# meta skgid != { 2001-2005} accept -__set%d test-ip4 7 size 3 -__set%d test-ip4 0 - element 00000000 : 1 [end] element d1070000 : 0 [end] element d6070000 : 1 [end] -ip test-ip4 input - [ meta load skgid => reg 1 ] - [ byteorder reg 1 = hton(reg 1, 4, 4) ] - [ lookup reg 1 set __set%d 0x1 ] - [ immediate reg 0 accept ] - -# meta cgroup {1048577-1048578} -__set%d test-ip4 7 size 3 -__set%d test-ip4 0 - element 00000000 : 1 [end] element 01001000 : 0 [end] element 03001000 : 1 [end] -ip test-ip4 input - [ meta load cgroup => reg 1 ] - [ byteorder reg 1 = hton(reg 1, 4, 4) ] - [ lookup reg 1 set __set%d ] - -# meta cgroup != { 1048577-1048578} -__set%d test-ip4 7 size 3 -__set%d test-ip4 0 - element 00000000 : 1 [end] element 01001000 : 0 [end] element 03001000 : 1 [end] -ip test-ip4 input - [ meta load cgroup => reg 1 ] - [ byteorder reg 1 = hton(reg 1, 4, 4) ] - [ lookup reg 1 set __set%d 0x1 ] - # meta time "1970-05-23 21:07:14" drop ip meta-test input [ meta load time => reg 1 ] |