diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-11-03 20:11:53 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-11-03 20:11:53 (GMT) |
commit | 97751fa5c985055cd10e789702fdc33f0d30b8ad (patch) | |
tree | 5de7856b68d1fd6db9aad3b6c9f2f0c36de1a434 /Lib/test | |
parent | 9fc59c9fc2927317f4f046d4b4f1aa1c3253ca11 (diff) | |
parent | 863c962e68417f74a4671de58725170fc91c3910 (diff) | |
download | cpython-97751fa5c985055cd10e789702fdc33f0d30b8ad.zip cpython-97751fa5c985055cd10e789702fdc33f0d30b8ad.tar.gz cpython-97751fa5c985055cd10e789702fdc33f0d30b8ad.tar.bz2 |
merge 3.2
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_socket.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 450aee1..ee4aea3 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1188,9 +1188,10 @@ class GeneralModuleTests(unittest.TestCase): if e.errno == socket.EAI_NODATA: self.skipTest('internet access required for this test') # these should all be successful - socket.gethostbyname('испытание.python.org') - socket.gethostbyname_ex('испытание.python.org') - socket.getaddrinfo('испытание.python.org',0,socket.AF_UNSPEC,socket.SOCK_STREAM) + domain = 'испытание.pythontest.net' + socket.gethostbyname(domain) + socket.gethostbyname_ex(domain) + socket.getaddrinfo(domain,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') |