From ce28a01e350bee803bbddab873090e59fb9d0c4c Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Wed, 22 Jul 2009 17:37:11 +0000 Subject: [PATCH] Merged revisions 74175 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74175 | r.david.murray | 2009-07-22 13:22:58 -0400 (Wed, 22 Jul 2009) | 4 lines Backport of fix for issue 6542: make sure test_os.TestInvalidFD.test_closerange does not close any valid file descriptors. ........ --- Lib/test/test_os.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 909e0abbecd..6d90f841584 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -556,7 +556,18 @@ class TestInvalidFD(unittest.TestCase): def test_closerange(self): if hasattr(os, "closerange"): fd = test_support.make_bad_fd() - self.assertEqual(os.closerange(fd, fd + 10), None) + # Make sure none of the descriptors we are about to close are + # currently valid (issue 6542). + for i in range(10): + try: os.fstat(fd+i) + except OSError: + pass + else: + break + if i < 2: + raise unittest.SkipTest( + "Unable to acquire a range of invalid file descriptors") + self.assertEqual(os.closerange(fd, fd + i-1), None) def test_dup2(self): if hasattr(os, "dup2"):