[Python-checkins] r84606 - in python/branches/release27-maint: Lib/test/test_support.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Sep  7 23:46:05 2010
New Revision: 84606

Log:
Merged revisions 84604 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84604 | antoine.pitrou | 2010-09-07 23:43:31 +0200 (mar., 07 sept. 2010) | 3 lines
  
  Also catch some gaierrors
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_support.py

Modified: python/branches/release27-maint/Lib/test/test_support.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_support.py	(original)
+++ python/branches/release27-maint/Lib/test/test_support.py	Tue Sep  7 23:46:05 2010
@@ -760,16 +760,25 @@
         ('ENETUNREACH', 101),
         ('ETIMEDOUT', 110),
     ]
+    default_gai_errnos = [
+        ('EAI_NONAME', -2),
+        ('EAI_NODATA', -5),
+    ]
 
     denied = ResourceDenied("Resource '%s' is not available" % resource_name)
     captured_errnos = errnos
+    gai_errnos = []
     if not captured_errnos:
         captured_errnos = [getattr(errno, name, num)
                            for (name, num) in default_errnos]
+        gai_errnos = [getattr(socket, name, num)
+                      for (name, num) in default_gai_errnos]
 
     def filter_error(err):
+        n = getattr(err, 'errno', None)
         if (isinstance(err, socket.timeout) or
-            getattr(err, 'errno', None) in captured_errnos):
+            (isinstance(err, socket.gaierror) and n in gai_errnos) or
+            n in captured_errnos):
             if not verbose:
                 sys.stderr.write(denied.args[0] + "\n")
             raise denied