[PATCH nft] tests: py: Add meta time tests without 'meta' keyword

[PATCH nft] tests: py: Add meta time tests without 'meta' keyword

[Martin Gignac]

v1.0.2 of 'nft' fails on 'time < "2022-07-01 11:00:00"' but succeeds
when 'meta' is specified ('meta time < "2022-07-01 11:00:00"'). This
extends coverage by testing 'time' without 'meta'.

Signed-off-by: Martin Gignac <martin.gignac@gmail.com>
---
 tests/py/any/meta.t         |  2 ++
 tests/py/any/meta.t.payload | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index e3beea2e..12fabb79 100644
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -218,6 +218,8 @@ meta hour "17:00:00" drop;ok;meta hour "17:00" drop
 meta hour "17:00:01" drop;ok
 meta hour "00:00" drop;ok
 meta hour "00:01" drop;ok
+time < "2022-07-01 11:00:00" accept;ok;meta time < "2022-07-01 11:00:00" accept
+time > "2022-07-01 11:00:00" accept;ok;meta time > "2022-07-01 11:00:00" accept
 
 meta time "meh";fail
 meta hour "24:00" drop;fail
diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index 15439062..16dc1211 100644
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -1058,3 +1058,17 @@ ip meta-test input
   [ meta load hour => reg 1 ]
   [ cmp eq reg 1 0x0001359c ]
   [ immediate reg 0 drop ]
+
+# time < "2022-07-01 11:00:00" accept
+ip test-ip4 input
+  [ meta load time => reg 1 ]
+  [ byteorder reg 1 = hton(reg 1, 8, 8) ]
+  [ cmp lt reg 1 0xf3a8fd16 0x00a07719 ]
+  [ immediate reg 0 accept ]
+
+# time > "2022-07-01 11:00:00" accept
+ip test-ip4 input
+  [ meta load time => reg 1 ]
+  [ byteorder reg 1 = hton(reg 1, 8, 8) ]
+  [ cmp gt reg 1 0xf3a8fd16 0x00a07719 ]
+  [ immediate reg 0 accept ]
-- 
2.35.1

Re: [PATCH nft] tests: py: Add meta time tests without 'meta' keyword

[Pablo Neira Ayuso]

On Sat, Apr 09, 2022 at 08:57:02AM -0400, Martin Gignac wrote:
> v1.0.2 of 'nft' fails on 'time < "2022-07-01 11:00:00"' but succeeds
> when 'meta' is specified ('meta time < "2022-07-01 11:00:00"'). This
> extends coverage by testing 'time' without 'meta'.

Applied, thanks.

I extended it to cover the json codebase too (./nft-test -j).

Re: [PATCH nft] tests: py: Add meta time tests without 'meta' keyword

[Martin Gignac]

> I extended it to cover the json codebase too (./nft-test -j).

I had originally included a similar JSON diff in the patch as well,
but then noticed that it made no difference to the output of the test
whether it was there or not, so I mistakenly concluded that it didn't
matter. The README didn't mention the '-j' flag, and I didn't search
in the Python code long enough to understand the relevance of
including the JSON diff. Thanks for adding it.