[v9_10] error in sockaddr unit test

4614.	[test]		Fixed an error in the sockaddr unit test. [RT #45146]

(cherry picked from commit d73c32c17fa6a59701bfdbfd78055f6d8c7c3d36)
(cherry picked from commit 512765ba1e3f0b29e2c1ae4b0138838c6422f2bd)

diff --git a/CHANGES b/CHANGES
index 6528f6e9c9b498e9c3dff2d5f252bc646904a287..0baffe5870038cb409368fcad43d9d7f63d40782 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4614.  [test]          Fixed an error in the sockaddr unit test. [RT #45146]
+
 4612.  [bug]           Silence 'may be use uninitalised' warning and simplify
                        the code in lwres/getaddinfo:process_answer.
                        [RT #45158]

diff --git a/lib/isc/tests/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c
index 6d02284aaaa495788ae09cd6b76456e4052d4679..09447f9ec2fc8e06742595256bc3d140fe028032 100644 (file)
--- a/lib/isc/tests/sockaddr_test.c
+++ b/lib/isc/tests/sockaddr_test.c
@@ -110,18 +110,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);
        }
 }