summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2010-08-16 05:10:30 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2010-08-16 05:10:30 (GMT)
commit8a9b22204e6f85521de7c833d503e4690e247227 (patch)
treef7234610a1d755cbd60154b094940630fe7de606 /Lib/test
parent1e8a75414ff57ff8fa42d59d5717be9639c55b12 (diff)
downloadcpython-8a9b22204e6f85521de7c833d503e4690e247227.zip
cpython-8a9b22204e6f85521de7c833d503e4690e247227.tar.gz
cpython-8a9b22204e6f85521de7c833d503e4690e247227.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')
-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 f3791c1..da8e155 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