upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 12:32:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '940-unit-dnstap-pkcs11-tz-v9_14' into 'v9_14'

Browse source 
Fix regression in dnstap_test with native pkcs11

See merge request isc-projects/bind9!1700
This commit is contained in:
Mark Andrews 2019-03-15 01:37:53 -04:00
commit 8c0a0011f4
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
5187. [test] Set time zone before running any tests in dnstap_test.
[GL #940]
5186. [cleanup] More dnssec-keygen manual tidying. [GL !1678]
5184. [bug] Missing unlocks in sdlz.c. [GL #936]

6
lib/dns/tests/dnstap_test.c
View file

@ -312,9 +312,6 @@ totext_test(void **state) {
UNUSED(state);
/* make sure text conversion gets the right local time */
setenv("TZ", "PST8", 1);
result = dns_dt_open(TAPSAVED, dns_dtmode_file, mctx, &handle);
assert_int_equal(result, ISC_R_SUCCESS);
@ -381,6 +378,9 @@ main(void) {
cmocka_unit_test_setup_teardown(totext_test, _setup, _teardown),
};
/* make sure text conversion gets the right local time */
setenv("TZ", "PST8", 1);
return (cmocka_run_group_tests(tests, NULL, NULL));
#else
print_message("1..0 # Skip dnstap not enabled\n");