From: Charles-François Natali <cf.natali@gmail.com>
Date: Sun, 8 Sep 2013 09:34:42 +0000 (+0200)
Subject: Issue #18963: Fix test_selectors.test_above_fd_setsize on OS X, where the
X-Git-Tag: v3.4.0a3~27^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9437d7a7fe81a5f80122d8c86ac469d20259eeea;p=python

Issue #18963: Fix test_selectors.test_above_fd_setsize on OS X, where the
default RLIMIT_NOFILE hard limit can be RLIMIT_INFINITY.
---

diff --git a/Lib/test/test_selectors.py b/Lib/test/test_selectors.py
index 2657a505b4..8041187cbf 100644
--- a/Lib/test/test_selectors.py
+++ b/Lib/test/test_selectors.py
@@ -301,7 +301,6 @@ class BaseSelectorTestCase(unittest.TestCase):
 
 class ScalableSelectorMixIn:
 
-    @support.requires_mac_ver(10, 5)
     @unittest.skipUnless(resource, "Test needs resource module")
     def test_above_fd_setsize(self):
         # A scalable implementation should have no problem with more than
@@ -313,7 +312,7 @@ class ScalableSelectorMixIn:
             self.addCleanup(resource.setrlimit, resource.RLIMIT_NOFILE,
                             (soft, hard))
             NUM_FDS = hard
-        except OSError:
+        except (OSError, ValueError):
             NUM_FDS = soft
 
         # guard for already allocated FDs (stdin, stdout...)