diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 07:06:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 07:06:53 (GMT) |
| commit | 2bf20a4e7e7e5da65679d31d4039149fd41cfe2f (patch) | |
| tree | 53b148fe8a2e8d744d6c3af3ef1bb8c16dc99b41 | |
| parent | a43ee1da14ee992df3081b49e458bb82bf0c9ae8 (diff) | |
| parent | 900db26d3455f70cfdcba1506b314733dbd0b7e1 (diff) | |
| download | cpython-2bf20a4e7e7e5da65679d31d4039149fd41cfe2f.zip cpython-2bf20a4e7e7e5da65679d31d4039149fd41cfe2f.tar.gz cpython-2bf20a4e7e7e5da65679d31d4039149fd41cfe2f.tar.bz2 | |
Merge 3.5 (test_socket, issue #25138)
| -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) |