From d73c32c17fa6a59701bfdbfd78055f6d8c7c3d36 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 2 May 2017 13:40:49 -0700 Subject: [PATCH] [master] error in sockaddr unit test 4614. [test] Fixed an error in the sockaddr unit test. [RT #45146] --- CHANGES | 2 ++ lib/isc/tests/sockaddr_test.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index da493efd19..c4f89d400a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4614. [test] Fixed an error in the sockaddr unit test. [RT #45146] + 4613. [func] By default, the maximum size of a zone journal file is now twice the size of the zone's contents (there is little benefit to a journal larger than this). diff --git a/lib/isc/tests/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c index 3ec98b24e3..86d12b7d58 100644 --- a/lib/isc/tests/sockaddr_test.c +++ b/lib/isc/tests/sockaddr_test.c @@ -102,18 +102,18 @@ ATF_TC_BODY(sockaddr_isnetzero, tc) { UNUSED(tc); for (i = 0; i < sizeof(data4)/sizeof(data4[0]); i++) { - in.s_addr = inet_addr(data4[0].string); + in.s_addr = inet_addr(data4[i].string); isc_sockaddr_fromin(&addr, &in, 1); r = isc_sockaddr_isnetzero(&addr); - ATF_CHECK_EQ(r, data4[0].expect); + ATF_CHECK_EQ_MSG(r, data4[i].expect, "%s", data4[i].string); } for (i = 0; i < sizeof(data6)/sizeof(data6[0]); i++) { - ret = inet_pton(AF_INET6, "::ffff:127.0.0.1", &in6); + ret = inet_pton(AF_INET6, data6[i].string, &in6); ATF_CHECK_EQ(ret, 1); isc_sockaddr_fromin6(&addr, &in6, 1); r = isc_sockaddr_isnetzero(&addr); - ATF_CHECK_EQ(r, data6[0].expect); + ATF_CHECK_EQ_MSG(r, data6[i].expect, "%s", data6[i].string); } }