diff --git a/CHANGES b/CHANGES index 06cb373c73..d6909749d7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4273. [bug] Only call dns_test_begin() and dns_test_end() once each + in nsec3_test as it fails with GOST if called multiple + times. + 4272. [bug] dig: the +norrcomments option didn't work with +multi. [RT #41234] diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c index dec0dc2e54..1f68d9109f 100644 --- a/lib/dns/tests/nsec3_test.c +++ b/lib/dns/tests/nsec3_test.c @@ -40,20 +40,15 @@ iteration_test(const char* file, unsigned int expected) { dns_db_t *db = NULL; unsigned int iterations; - result = dns_test_begin(NULL, ISC_FALSE); - ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - result = dns_test_loaddb(&db, dns_dbtype_zone, "test", file); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); result = dns_nsec3_maxiterations(db, NULL, mctx, &iterations); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - ATF_REQUIRE_EQ(iterations, expected); + ATF_CHECK_EQ(iterations, expected); dns_db_detach(&db); - - dns_test_end(); } /* @@ -66,14 +61,20 @@ ATF_TC_HEAD(max_iterations, tc) { " is returned for different key size mixes"); } ATF_TC_BODY(max_iterations, tc) { + isc_result_t result; UNUSED(tc); + result = dns_test_begin(NULL, ISC_FALSE); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + iteration_test("testdata/nsec3/1024.db", 150); iteration_test("testdata/nsec3/2048.db", 500); iteration_test("testdata/nsec3/4096.db", 2500); iteration_test("testdata/nsec3/min-1024.db", 150); iteration_test("testdata/nsec3/min-2048.db", 500); + + dns_test_end(); } #else ATF_TC(untested);