summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_socket.py
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2010-08-16 05:09:31 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2010-08-16 05:09:31 (GMT)
commit5b37ce64c1a8108406cd0ae19e15b9ebd855c2f6 (patch)
tree03b0ffe8eb9e1101cd80eecb72b42d4f868e217d /Lib/test/test_socket.py
parent6c4dbd0d4426c0005c44dea574aaa7d4efb973b4 (diff)
downloadcpython-5b37ce64c1a8108406cd0ae19e15b9ebd855c2f6.zip
cpython-5b37ce64c1a8108406cd0ae19e15b9ebd855c2f6.tar.gz
cpython-5b37ce64c1a8108406cd0ae19e15b9ebd855c2f6.tar.bz2
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' ........
Diffstat (limited to 'Lib/test/test_socket.py')
-rw-r--r--Lib/test/test_socket.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 276f4c6..5e340bf 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -598,7 +598,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