diff options
| author | Larry Hastings <larry@hastings.org> | 2013-09-09 12:12:21 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2013-09-09 12:12:21 (GMT) |
| commit | 8568f66daf088cf235a42288621fb4770ac48199 (patch) | |
| tree | 3db459417e7c4b112b03d59661057f09ff058d07 /Lib/test/test_selectors.py | |
| parent | 60560b18d29a917e64d88d47c5533743001f0787 (diff) | |
| parent | 23543ebd8676384c1c5e28f7a1496777a57479d5 (diff) | |
| download | cpython-8568f66daf088cf235a42288621fb4770ac48199.zip cpython-8568f66daf088cf235a42288621fb4770ac48199.tar.gz cpython-8568f66daf088cf235a42288621fb4770ac48199.tar.bz2 | |
Merge.
Diffstat (limited to 'Lib/test/test_selectors.py')
| -rw-r--r-- | Lib/test/test_selectors.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_selectors.py b/Lib/test/test_selectors.py index 2657a50..6ce4d8a 100644 --- a/Lib/test/test_selectors.py +++ b/Lib/test/test_selectors.py @@ -301,6 +301,7 @@ class BaseSelectorTestCase(unittest.TestCase): class ScalableSelectorMixIn: + # see issue #18963 for why it's skipped on older OS X versions @support.requires_mac_ver(10, 5) @unittest.skipUnless(resource, "Test needs resource module") def test_above_fd_setsize(self): @@ -313,7 +314,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...) |