From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Mon, 16 Aug 2010 05:10:30 +0000 (+0000)
Subject: Merged revisions 84089 via svnmerge from
X-Git-Tag: v2.7.1rc1~398
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a9b22204e6f85521de7c833d503e4690e247227;p=python

Merged revisions 84089 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84089 | giampaolo.rodola | 2010-08-16 07:08:11 +0200 (lun, 16 ago 2010) | 1 line

  fix getaddrinfo test failure on OSX caused by AI_CANNAME erroneously used as the value for 'proto'
........
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index f3791c179e..da8e155b0e 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -602,7 +602,7 @@ class GeneralModuleTests(unittest.TestCase):
         for _, socktype, _, _, _ in infos:
             self.assertEqual(socktype, socket.SOCK_STREAM)
         # test proto and flags arguments
-        socket.getaddrinfo(HOST, None, 0, 0, socket.AI_CANONNAME)
+        socket.getaddrinfo(HOST, None, 0, 0, socket.SOL_TCP)
         socket.getaddrinfo(HOST, None, 0, 0, 0, socket.AI_PASSIVE)
         # a server willing to support both IPv4 and IPv6 will
         # usually do this