[Python-checkins] r74176 - in python/branches/release26-maint: Lib/test/test_os.py

[r.david.murray]

Author: r.david.murray
Date: Wed Jul 22 19:37:11 2009
New Revision: 74176

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_os.py

Modified: python/branches/release26-maint/Lib/test/test_os.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_os.py	(original)
+++ python/branches/release26-maint/Lib/test/test_os.py	Wed Jul 22 19:37:11 2009
@@ -556,7 +556,18 @@
     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"):