ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4273. [bug] Only call dns_test_begin() and dns_test_end() once each

Browse Source 
in nsec3_test as it fails with GOST if called multiple
                        times.
This commit is contained in:
Mark Andrews
2015-12-07 17:52:37 +11:00
parent a12a21a843
commit 95bef099e9
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -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]

13
lib/dns/tests/nsec3_test.c
View File

@@ -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);