From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 21 Sep 2015 07:04:01 +0000 (+0200)
Subject: Issue #25138: test_socket.test_idna() uses support.transient_internet() instead
X-Git-Tag: v3.5.1rc1~312^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=808d6416e37bac2d8aa3ebe869f459d39e46cf0c;p=python

Issue #25138: test_socket.test_idna() uses support.transient_internet() instead
of catching socket.EAI_NODATA error which doesn't exist on FreeBSD.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index cc8da17609..d3191121b5 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1284,12 +1284,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)