diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 07:04:17 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 07:04:17 (GMT) |
| commit | 900db26d3455f70cfdcba1506b314733dbd0b7e1 (patch) | |
| tree | 8c72ee123c4eeacaab10b5001071a7aa5e880168 /Lib/test/test_socket.py | |
| parent | a4950d875a6d42a910cbbe0e3f9aca2dea206106 (diff) | |
| parent | 808d6416e37bac2d8aa3ebe869f459d39e46cf0c (diff) | |
| download | cpython-900db26d3455f70cfdcba1506b314733dbd0b7e1.zip cpython-900db26d3455f70cfdcba1506b314733dbd0b7e1.tar.gz cpython-900db26d3455f70cfdcba1506b314733dbd0b7e1.tar.bz2 | |
Merge 3.4 (test_socket, issue #25138)
Diffstat (limited to 'Lib/test/test_socket.py')
| -rw-r--r-- | Lib/test/test_socket.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index a089ef1..17819f2 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1289,12 +1289,11 @@ class GeneralModuleTests(unittest.TestCase): @unittest.skipUnless(support.is_resource_enabled('network'), 'network is not enabled') def test_idna(self): - # Check for internet access before running test (issue #12804). - try: + # Check for internet access before running test + # (issue #12804, issue #25138). + with support.transient_internet('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 domain = 'испытание.pythontest.net' socket.gethostbyname(domain) |