From 1cf12540515e4a3fc93ace02b81815209f1e709e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 29 Oct 2018 16:15:52 +1100 Subject: [PATCH] Initalize TZ environment variable before calling dns_test_begin in dnstap_test. --- CHANGES | 7 +++++-- lib/dns/tests/dnstap_test.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index f887d92dd4..24b5223691 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -5063. [test] In statschannel test try a few times before failing when - checking if the compressed output is the same as +5064. [test] Initalize TZ environment variable before calling + dns_test_begin in dnstap_test. [GL #624] + +5063. [test] In statschannel test try a few times before failing + when checking if the compressed output is the same as uncompressed. [GL !909] 5062. [func] Use non-crypto-secure PRNG to generate nonces for diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c index 96fe28a20f..3da5117f79 100644 --- a/lib/dns/tests/dnstap_test.c +++ b/lib/dns/tests/dnstap_test.c @@ -297,6 +297,9 @@ ATF_TC_BODY(totext, tc) { UNUSED(tc); + /* make sure text conversion gets the right local time */ + setenv("TZ", "PST8", 1); + result = dns_test_begin(NULL, true); ATF_REQUIRE(result == ISC_R_SUCCESS); @@ -306,9 +309,6 @@ ATF_TC_BODY(totext, tc) { result = isc_stdio_open(TAPTEXT, "r", &fp); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - /* make sure text conversion gets the right local time */ - setenv("TZ", "PST8", 1); - while (dns_dt_getframe(handle, &data, &dsize) == ISC_R_SUCCESS) { dns_dtdata_t *dtdata = NULL; isc_buffer_t *b = NULL;