From 7e326d697ecf43ea029de5584e59701eb61ca87e Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sat, 16 Nov 2019 22:32:18 +0100 Subject: tests/py: Set a fixed timezone in nft-test.py Payload generated for 'meta time' matches depends on host's timezone and DST setting. To produce constant output, set a fixed timezone in nft-test.py. Choose UTC-2 since most payloads are correct then, adjust the remaining two tests. Fixes: 0518ea3f70d8c ("tests: add meta time test cases") Signed-off-by: Phil Sutter Acked-by: Ander Juaristi Acked-by: Pablo Neira Ayuso --- tests/py/any/meta.t | 2 +- tests/py/any/meta.t.payload | 2 +- tests/py/nft-test.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t index 86e5d258..327f973f 100644 --- a/tests/py/any/meta.t +++ b/tests/py/any/meta.t @@ -205,7 +205,7 @@ meta random eq 1;ok;meta random 1 meta random gt 1000000;ok;meta random > 1000000 meta time "1970-05-23 21:07:14" drop;ok -meta time 12341234 drop;ok;meta time "1970-05-23 21:07:14" drop +meta time 12341234 drop;ok;meta time "1970-05-23 22:07:14" drop meta time "2019-06-21 17:00:00" drop;ok meta time "2019-07-01 00:00:00" drop;ok meta time "2019-07-01 00:01:00" drop;ok diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload index 402caae5..486d7aa5 100644 --- a/tests/py/any/meta.t.payload +++ b/tests/py/any/meta.t.payload @@ -1050,7 +1050,7 @@ ip test-ip4 input # meta time "1970-05-23 21:07:14" drop ip meta-test input [ meta load time => reg 1 ] - [ cmp eq reg 1 0x74a8f400 0x002bd849 ] + [ cmp eq reg 1 0x43f05400 0x002bd503 ] [ immediate reg 0 drop ] # meta time 12341234 drop diff --git a/tests/py/nft-test.py b/tests/py/nft-test.py index ce42b5dd..6edca3c6 100755 --- a/tests/py/nft-test.py +++ b/tests/py/nft-test.py @@ -24,6 +24,7 @@ import tempfile TESTS_PATH = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.join(TESTS_PATH, '../../py/')) +os.environ['TZ'] = 'UTC-2' from nftables import Nftables -- cgit v1.2.3