diff options
author | Phil Sutter <phil@nwl.cc> | 2018-05-28 18:51:07 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-06-01 09:16:48 +0200 |
commit | 984c3657343c5a0d2d75f55ff94fad218569fae0 (patch) | |
tree | cc51351a87a225be1c33c810b637038b8079f280 /tests | |
parent | d09eaf0fc19ca3664f535bf64c3f94e05fb7323d (diff) |
tests/py: Adjust JSON for changes in any/ct.t
Commit 71624f25f22b1 ("tests: py: add expires tests with different time
bases") removed two testcases and added five other ones, adjust JSON
equivalent and recorded output to those changes.
Fixes: 71624f25f22b1 ("tests: py: add expires tests with different time bases")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/py/any/ct.t.json | 39 | ||||
-rw-r--r-- | tests/py/any/ct.t.json.output | 59 |
2 files changed, 94 insertions, 4 deletions
diff --git a/tests/py/any/ct.t.json b/tests/py/any/ct.t.json index 83f1bbbd..3ec00ab3 100644 --- a/tests/py/any/ct.t.json +++ b/tests/py/any/ct.t.json @@ -708,7 +708,7 @@ } ] -# ct expiration 30 +# ct expiration 30s [ { "match": { @@ -717,12 +717,12 @@ "key": "expiration" } }, - "right": 30 + "right": "30s" } } ] -# ct expiration 22 +# ct expiration 30000ms [ { "match": { @@ -731,7 +731,38 @@ "key": "expiration" } }, - "right": 22 + "right": "30000ms" + } + } +] + +# ct expiration 1m-1h +[ + { + "match": { + "left": { + "ct": { + "key": "expiration" + } + }, + "right": { + "range": [ "1m", "1h" ] + } + } + } +] + +# ct expiration > 4d23h59m59s +[ + { + "match": { + "left": { + "ct": { + "key": "expiration" + } + }, + "op": ">", + "right": "4d23h59m59s" } } ] diff --git a/tests/py/any/ct.t.json.output b/tests/py/any/ct.t.json.output index 01dbb486..ce33a681 100644 --- a/tests/py/any/ct.t.json.output +++ b/tests/py/any/ct.t.json.output @@ -400,6 +400,65 @@ } ] +# ct expiration 30s +[ + { + "match": { + "left": { + "ct": { + "key": "expiration" + } + }, + "right": 30 + } + } +] + +# ct expiration 30000ms +[ + { + "match": { + "left": { + "ct": { + "key": "expiration" + } + }, + "right": 30 + } + } +] + +# ct expiration 1m-1h +[ + { + "match": { + "left": { + "ct": { + "key": "expiration" + } + }, + "right": { + "range": [ 60, 3600 ] + } + } + } +] + +# ct expiration > 4d23h59m59s +[ + { + "match": { + "left": { + "ct": { + "key": "expiration" + } + }, + "op": ">", + "right": 431999 + } + } +] + # ct state . ct mark { new . 0x12345678} [ { |