From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 22 Jul 2009 15:20:27 +0000 (+0000)
Subject: Issue 6542: Make sure that TestInvalidFD.test_closerange does not
X-Git-Tag: v3.2a1~2753
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=630cc4821c775f2b456b0744c39dc8531c75e54b;p=python

Issue 6542: Make sure that 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 63f409e958..62edd6c4fb 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -617,7 +617,18 @@ class TestInvalidFD(unittest.TestCase):
     def test_closerange(self):
         if hasattr(os, "closerange"):
             fd = 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"):