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.
........

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 909e0abbecd35e81111f648990fe1858677fb4b0..6d90f8415843c33920158b7b5c72afc407962794 100644 (file)
--- 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"):