diff options
| author | Charles-François Natali <cf.natali@gmail.com> | 2013-09-08 09:34:42 (GMT) |
|---|---|---|
| committer | Charles-François Natali <cf.natali@gmail.com> | 2013-09-08 09:34:42 (GMT) |
| commit | 9437d7a7fe81a5f80122d8c86ac469d20259eeea (patch) | |
| tree | 1384bfd4b7ffef06a7e64100b24623f9f5e653db /Lib/test/test_selectors.py | |
| parent | 45e255167eb8cc34c85439dbdc8074a9b25bec2d (diff) | |
| download | cpython-9437d7a7fe81a5f80122d8c86ac469d20259eeea.zip cpython-9437d7a7fe81a5f80122d8c86ac469d20259eeea.tar.gz cpython-9437d7a7fe81a5f80122d8c86ac469d20259eeea.tar.bz2 | |
Issue #18963: Fix test_selectors.test_above_fd_setsize on OS X, where the
default RLIMIT_NOFILE hard limit can be RLIMIT_INFINITY.
Diffstat (limited to 'Lib/test/test_selectors.py')
| -rw-r--r-- | Lib/test/test_selectors.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_selectors.py b/Lib/test/test_selectors.py index 2657a50..8041187 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...) |