cpython: d8dd06ab00e4 (original) (raw)

Mercurial > cpython

changeset 98130:d8dd06ab00e4

Merge 3.5 (test_socket, issue #25138) [#25138]

Victor Stinner victor.stinner@gmail.com
date	Mon, 21 Sep 2015 09:06:53 +0200
parents	b31cc00d4363(current diff)a7baccf0b1c2(diff)
children	28d56d7deafc
files
diffstat	1 files changed, 4 insertions(+), 5 deletions(-)[+] [-] Lib/test/test_socket.py 9

line wrap: on

line diff

--- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1289,12 +1289,11 @@ class GeneralModuleTests(unittest.TestCa @unittest.skipUnless(support.is_resource_enabled('network'), 'network is not enabled') def test_idna(self):

   # Check for internet access before running test (issue #12804).[](#l1.7)

```
   try:[](#l1.8)
```

   # Check for internet access before running test[](#l1.9)

   # (issue #12804, issue #25138).[](#l1.10)

   with support.transient_internet('python.org'):[](#l1.11)
       socket.gethostbyname('python.org')[](#l1.12)

   except socket.gaierror as e:[](#l1.13)

       if e.errno == socket.EAI_NODATA:[](#l1.14)

           self.skipTest('internet access required for this test')[](#l1.15)

+ # these should all be successful domain = 'испытание.pythontest.net' socket.gethostbyname(domain)