BIND 10 trac1298, updated. c03e6df1521a378fa3cb9eab4a11db93e6e34969 [1298] update tests

[BIND 10 source code commits]

The branch, trac1298 has been updated
       via  c03e6df1521a378fa3cb9eab4a11db93e6e34969 (commit)
      from  45bd390859827c02965765b4b146b5351cbbb1c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c03e6df1521a378fa3cb9eab4a11db93e6e34969
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Nov 8 14:23:27 2011 +0100

    [1298] update tests

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/tests/xfrin_test.py |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index 9d3fa0b..ae00e28 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -2179,26 +2179,33 @@ class TestFormatting(unittest.TestCase):
         # (family, sockettype, (address, port))
         # of which sockettype is ignored
         self.assertEqual("192.0.2.1:53",
-                         format_addrinfo((socket.AF_INET, None,
+                         format_addrinfo((socket.AF_INET, socket.SOCK_STREAM,
                                           ("192.0.2.1", 53))))
         self.assertEqual("192.0.2.2:53",
-                         format_addrinfo((socket.AF_INET, None,
+                         format_addrinfo((socket.AF_INET, socket.SOCK_STREAM,
                                           ("192.0.2.2", 53))))
         self.assertEqual("192.0.2.1:54",
-                         format_addrinfo((socket.AF_INET, None,
+                         format_addrinfo((socket.AF_INET, socket.SOCK_STREAM,
                                           ("192.0.2.1", 54))))
-        self.assertEqual("[::1]:53",
-                         format_addrinfo((socket.AF_INET6, None,
-                                          ("::1", 53))))
-        self.assertEqual("[::2]:53",
-                         format_addrinfo((socket.AF_INET6, None,
-                                          ("::2", 53))))
-        self.assertEqual("[::1]:54",
-                         format_addrinfo((socket.AF_INET6, None,
-                                          ("::1", 54))))
+        self.assertEqual("[2001:db8::1]:53",
+                         format_addrinfo((socket.AF_INET6, socket.SOCK_STREAM,
+                                          ("2001:db8::1", 53))))
+        self.assertEqual("[2001:db8::2]:53",
+                         format_addrinfo((socket.AF_INET6, socket.SOCK_STREAM,
+                                          ("2001:db8::2", 53))))
+        self.assertEqual("[2001:db8::1]:54",
+                         format_addrinfo((socket.AF_INET6, socket.SOCK_STREAM,
+                                          ("2001:db8::1", 54))))
         self.assertEqual("/some/file",
-                         format_addrinfo((socket.AF_UNIX, None,
+                         format_addrinfo((socket.AF_UNIX, socket.SOCK_STREAM,
                                           "/some/file")))
+        # second element of passed tuple should be ignored
+        self.assertEqual("192.0.2.1:53",
+                         format_addrinfo((socket.AF_INET, None,
+                                          ("192.0.2.1", 53))))
+        self.assertEqual("192.0.2.1:53",
+                         format_addrinfo((socket.AF_INET, "Just some string",
+                                          ("192.0.2.1", 53))))
         self.assertRaises(TypeError, format_addrinfo, 1)
         self.assertRaises(TypeError, format_addrinfo,
                                      (socket.AF_INET, "asdf"))