summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-08-23 15:27:26 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-08-23 15:27:26 (GMT)
commit67e91ad9cfe17c8d0658d9310e69ee0f9ec48db7 (patch)
tree816cc10e2eab9515fd61c448c2e59e6c81bd8a97
parentee6d64773b3137ef59272517ee0491dd7748d46d (diff)
downloadcpython-67e91ad9cfe17c8d0658d9310e69ee0f9ec48db7.zip
cpython-67e91ad9cfe17c8d0658d9310e69ee0f9ec48db7.tar.gz
cpython-67e91ad9cfe17c8d0658d9310e69ee0f9ec48db7.tar.bz2
Explicitly pass socket type and family for getaddrinfo,
to make test work on Solaris. Disable gethostbyaddr IDNA test for now as there is no reverse DNS entry for the IPv6 address of the test name.
-rw-r--r--Lib/test/test_socket.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 1a85c0e..60e5bf7 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -641,8 +641,10 @@ class GeneralModuleTests(unittest.TestCase):
# these should all be successful
socket.gethostbyname('испытание.python.org')
socket.gethostbyname_ex('испытание.python.org')
- socket.getaddrinfo('испытание.python.org',0)
- socket.gethostbyaddr('испытание.python.org')
+ socket.getaddrinfo('испытание.python.org',0,socket.AF_UNSPEC,socket.SOCK_STREAM)
+ # this may not work if the forward lookup choses the IPv6 address, as that doesn't
+ # have a reverse entry yet
+ # socket.gethostbyaddr('испытание.python.org')
@unittest.skipUnless(thread, 'Threading required for this test.')
class BasicTCPTest(SocketConnectedTest):