mirror of
https://github.com/python/cpython.git
synced 2025-12-09 02:35:14 +00:00
Merge 3.4 (test_socket, issue #25138)
This commit is contained in:
commit
900db26d34
1 changed files with 4 additions and 5 deletions
|
|
@ -1289,12 +1289,11 @@ class GeneralModuleTests(unittest.TestCase):
|
||||||
@unittest.skipUnless(support.is_resource_enabled('network'),
|
@unittest.skipUnless(support.is_resource_enabled('network'),
|
||||||
'network is not enabled')
|
'network is not enabled')
|
||||||
def test_idna(self):
|
def test_idna(self):
|
||||||
# Check for internet access before running test (issue #12804).
|
# Check for internet access before running test
|
||||||
try:
|
# (issue #12804, issue #25138).
|
||||||
|
with support.transient_internet('python.org'):
|
||||||
socket.gethostbyname('python.org')
|
socket.gethostbyname('python.org')
|
||||||
except socket.gaierror as e:
|
|
||||||
if e.errno == socket.EAI_NODATA:
|
|
||||||
self.skipTest('internet access required for this test')
|
|
||||||
# these should all be successful
|
# these should all be successful
|
||||||
domain = 'испытание.pythontest.net'
|
domain = 'испытание.pythontest.net'
|
||||||
socket.gethostbyname(domain)
|
socket.gethostbyname(domain)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue