[Python-checkins] r84090 - in python/branches/release31-maint: Lib/test/test_socket.py

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Mon Aug 16 07:09:31 2010
New Revision: 84090

Log:
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'
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_socket.py

Modified: python/branches/release31-maint/Lib/test/test_socket.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_socket.py	(original)
+++ python/branches/release31-maint/Lib/test/test_socket.py	Mon Aug 16 07:09:31 2010
@@ -598,7 +598,7 @@
         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