From 3227aba58a74573a99417126ce335a0a5be53bce Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sat, 15 Jan 2022 18:27:08 +0000 Subject: tests: py: remove redundant payload expressions Now that we keep track of more payload dependencies, more redundant payloads are eliminated. Remove these from the Python test-cases. Signed-off-by: Jeremy Sowden Signed-off-by: Florian Westphal --- tests/py/inet/icmpX.t | 2 +- tests/py/inet/icmpX.t.json.output | 9 --------- tests/py/inet/sets.t.json | 11 ----------- 3 files changed, 1 insertion(+), 21 deletions(-) (limited to 'tests/py') diff --git a/tests/py/inet/icmpX.t b/tests/py/inet/icmpX.t index 97ff96d0..9430b3d3 100644 --- a/tests/py/inet/icmpX.t +++ b/tests/py/inet/icmpX.t @@ -7,4 +7,4 @@ icmp type echo-request;ok ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;ip6 nexthdr 58 icmpv6 type echo-request icmpv6 type echo-request;ok # must not remove 'ip protocol' dependency, this explicitly matches icmpv6-in-ipv4. -ip protocol ipv6-icmp meta l4proto ipv6-icmp icmpv6 type 1;ok;ip protocol 58 meta l4proto 58 icmpv6 type destination-unreachable +ip protocol ipv6-icmp meta l4proto ipv6-icmp icmpv6 type 1;ok;ip protocol 58 icmpv6 type destination-unreachable diff --git a/tests/py/inet/icmpX.t.json.output b/tests/py/inet/icmpX.t.json.output index 9b0bf9f7..7765cd90 100644 --- a/tests/py/inet/icmpX.t.json.output +++ b/tests/py/inet/icmpX.t.json.output @@ -68,15 +68,6 @@ "right": 58 } }, - { - "match": { - "left": { - "meta": { "key": "l4proto" } - }, - "op": "==", - "right": 58 - } - }, { "match": { "left": { diff --git a/tests/py/inet/sets.t.json b/tests/py/inet/sets.t.json index ef0cedca..b44ffc20 100644 --- a/tests/py/inet/sets.t.json +++ b/tests/py/inet/sets.t.json @@ -73,17 +73,6 @@ # ip daddr . tcp dport { 10.0.0.0/8 . 10-23, 192.168.1.1-192.168.3.8 . 80-443 } accept [ - { - "match": { - "left": { - "meta": { - "key": "nfproto" - } - }, - "op": "==", - "right": "ipv4" - } - }, { "match": { "left": { -- cgit v1.2.3