[Python-checkins] cpython (merge 3.4 -> default): Issue #21901: Cap the maximum number of file descriptors to use for the test.

[charles-francois.natali]

http://hg.python.org/cpython/rev/89665cc05592
changeset:   91774:89665cc05592
parent:      91770:fe3c98313855
parent:      91773:7238c6a05ca6
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Tue Jul 22 21:29:52 2014 +0100
summary:
  Issue #21901: Cap the maximum number of file descriptors to use for the test.

files:
  Lib/test/test_selectors.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_selectors.py b/Lib/test/test_selectors.py
--- a/Lib/test/test_selectors.py
+++ b/Lib/test/test_selectors.py
@@ -378,7 +378,7 @@
             resource.setrlimit(resource.RLIMIT_NOFILE, (hard, hard))
             self.addCleanup(resource.setrlimit, resource.RLIMIT_NOFILE,
                             (soft, hard))
-            NUM_FDS = hard
+            NUM_FDS = min(hard, 2**16)
         except (OSError, ValueError):
             NUM_FDS = soft
 

-- 
Repository URL: http://hg.python.org/cpython