diff mbox series

[nft,v2,5/5] tests: py: Drop needless recorded JSON outputs

Message ID 20240322160645.18331-6-phil@nwl.cc
State Accepted
Headers show
Series json: Accept more than two operands in binary expressions | expand

Commit Message

Phil Sutter March 22, 2024, 4:06 p.m. UTC 
These match the input already, no need to track them.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 tests/py/any/last.t.json.output   |   7 -
 tests/py/any/meta.t.json.output   | 180 --------------------
 tests/py/inet/tcp.t.json.output   | 265 ------------------------------
 tests/py/ip/numgen.t.json.output  |  30 ----
 tests/py/ip6/exthdr.t.json.output |  30 ----
 5 files changed, 512 deletions(-)
diff mbox series

Patch

diff --git a/tests/py/any/last.t.json.output b/tests/py/any/last.t.json.output
index b8a977edfca7f..e8ec4f478a428 100644
--- a/tests/py/any/last.t.json.output
+++ b/tests/py/any/last.t.json.output
@@ -1,10 +1,3 @@ 
-# last
-[
-    {
-        "last": null
-    }
-]
-
 # last used 300s
 [
     {
diff --git a/tests/py/any/meta.t.json.output b/tests/py/any/meta.t.json.output
index 4e9e669fdbc3b..d46935dee513d 100644
--- a/tests/py/any/meta.t.json.output
+++ b/tests/py/any/meta.t.json.output
@@ -592,24 +592,6 @@ 
     }
 ]
 
-# meta time "1970-05-23 21:07:14" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "time"
-                }
-            },
-            "op": "==",
-            "right": "1970-05-23 21:07:14"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
 # meta time 12341234 drop
 [
     {
@@ -628,96 +610,6 @@ 
     }
 ]
 
-# meta time "2019-06-21 17:00:00" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "time"
-                }
-            },
-            "op": "==",
-            "right": "2019-06-21 17:00:00"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
-# meta time "2019-07-01 00:00:00" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "time"
-                }
-            },
-            "op": "==",
-            "right": "2019-07-01 00:00:00"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
-# meta time "2019-07-01 00:01:00" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "time"
-                }
-            },
-            "op": "==",
-            "right": "2019-07-01 00:01:00"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
-# meta time "2019-07-01 00:00:01" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "time"
-                }
-            },
-            "op": "==",
-            "right": "2019-07-01 00:00:01"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
-# meta day "Saturday" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "day"
-                }
-            },
-            "op": "==",
-            "right": "Saturday"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
 # meta day 6 drop
 [
     {
@@ -736,24 +628,6 @@ 
     }
 ]
 
-# meta hour "17:00" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "hour"
-                }
-            },
-            "op": "==",
-            "right": "17:00"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
 # meta hour "17:00:00" drop
 [
     {
@@ -772,57 +646,3 @@ 
     }
 ]
 
-# meta hour "17:00:01" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "hour"
-                }
-            },
-            "op": "==",
-            "right": "17:00:01"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
-# meta hour "00:00" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "hour"
-                }
-            },
-            "op": "==",
-            "right": "00:00"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
-# meta hour "00:01" drop
-[
-    {
-        "match": {
-            "left": {
-                "meta": {
-                    "key": "hour"
-                }
-            },
-            "op": "==",
-            "right": "00:01"
-        }
-    },
-    {
-        "drop": null
-    }
-]
-
diff --git a/tests/py/inet/tcp.t.json.output b/tests/py/inet/tcp.t.json.output
index 3f03c0ddd1586..d487a8f1bfa09 100644
--- a/tests/py/inet/tcp.t.json.output
+++ b/tests/py/inet/tcp.t.json.output
@@ -115,32 +115,6 @@ 
     }
 ]
 
-# tcp flags { syn, syn | ack }
-[
-    {
-        "match": {
-            "left": {
-                "payload": {
-                    "field": "flags",
-                    "protocol": "tcp"
-                }
-            },
-            "op": "==",
-            "right": {
-                "set": [
-                    "syn",
-                    {
-                        "|": [
-                            "syn",
-                            "ack"
-                        ]
-                    }
-                ]
-            }
-        }
-    }
-]
-
 # tcp flags & (fin | syn | rst | psh | ack | urg) == { fin, ack, psh | ack, fin | psh | ack }
 [
     {
@@ -188,242 +162,3 @@ 
         }
     }
 ]
-
-# tcp flags fin,syn / fin,syn
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn"
-                        ]
-                    }
-                ]
-            },
-            "op": "==",
-            "right": {
-                "|": [
-                    "fin",
-                    "syn"
-                ]
-            }
-        }
-    }
-]
-
-# tcp flags != syn / fin,syn
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn"
-                        ]
-                    }
-                ]
-            },
-            "op": "!=",
-            "right": "syn"
-        }
-    }
-]
-
-# tcp flags & (fin | syn | rst | ack) syn
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn",
-                            "rst",
-                            "ack"
-                        ]
-                    }
-                ]
-            },
-            "op": "==",
-            "right": "syn"
-        }
-    }
-]
-
-# tcp flags & (fin | syn | rst | ack) == syn
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn",
-                            "rst",
-                            "ack"
-                        ]
-                    }
-                ]
-            },
-            "op": "==",
-            "right": "syn"
-        }
-    }
-]
-
-# tcp flags & (fin | syn | rst | ack) != syn
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn",
-                            "rst",
-                            "ack"
-                        ]
-                    }
-                ]
-            },
-            "op": "!=",
-            "right": "syn"
-        }
-    }
-]
-
-# tcp flags & (fin | syn | rst | ack) == syn | ack
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn",
-                            "rst",
-                            "ack"
-                        ]
-                    }
-                ]
-            },
-            "op": "==",
-            "right": {
-                "|": [
-                    "syn",
-                    "ack"
-                ]
-            }
-        }
-    }
-]
-
-# tcp flags & (fin | syn | rst | ack) != syn | ack
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "fin",
-                            "syn",
-                            "rst",
-                            "ack"
-                        ]
-                    }
-                ]
-            },
-            "op": "!=",
-            "right": {
-                "|": [
-                    "syn",
-                    "ack"
-                ]
-            }
-        }
-    }
-]
-
-# tcp flags & (syn | ack) == syn | ack
-[
-    {
-        "match": {
-            "left": {
-                "&": [
-                    {
-                        "payload": {
-                            "field": "flags",
-                            "protocol": "tcp"
-                        }
-                    },
-                    {
-                        "|": [
-                            "syn",
-                            "ack"
-                        ]
-                    }
-                ]
-            },
-            "op": "==",
-            "right": {
-                "|": [
-                    "syn",
-                    "ack"
-                ]
-            }
-        }
-    }
-]
-
diff --git a/tests/py/ip/numgen.t.json.output b/tests/py/ip/numgen.t.json.output
index 06ad1eccae5cf..b54121ca0f721 100644
--- a/tests/py/ip/numgen.t.json.output
+++ b/tests/py/ip/numgen.t.json.output
@@ -80,33 +80,3 @@ 
     }
 ]
 
-# dnat to numgen inc mod 7 offset 167772161
-[
-    {
-        "dnat": {
-            "addr": {
-                "numgen": {
-                    "mod": 7,
-                    "mode": "inc",
-                    "offset": 167772161
-                }
-            }
-        }
-    }
-]
-
-# dnat to numgen inc mod 255 offset 167772161
-[
-    {
-        "dnat": {
-            "addr": {
-                "numgen": {
-                    "mod": 255,
-                    "mode": "inc",
-                    "offset": 167772161
-                }
-            }
-        }
-    }
-]
-
diff --git a/tests/py/ip6/exthdr.t.json.output b/tests/py/ip6/exthdr.t.json.output
index c9f5b49b915c8..813402a26c7f4 100644
--- a/tests/py/ip6/exthdr.t.json.output
+++ b/tests/py/ip6/exthdr.t.json.output
@@ -1,33 +1,3 @@ 
-# exthdr hbh == exists
-[
-    {
-        "match": {
-            "left": {
-                "exthdr": {
-                    "name": "hbh"
-                }
-            },
-	    "op": "==",
-            "right": true
-        }
-    }
-]
-
-# exthdr hbh == missing
-[
-    {
-        "match": {
-            "left": {
-                "exthdr": {
-                    "name": "hbh"
-                }
-            },
-	    "op": "==",
-            "right": false
-        }
-    }
-]
-
 # exthdr hbh 1
 [
     {