Merged revisions 74171 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74171 | r.david.murray | 2009-07-22 11:20:27 -0400 (Wed, 22 Jul 2009) | 3 lines

  Issue 6542: Make sure that TestInvalidFD.test_closerange does not
  close any valid file descriptors.
........
This commit is contained in:
R. David Murray 2009-07-22 15:23:36 +00:00
parent 069bcc3dd9
commit 1f1b9a48e7
1 changed files with 12 additions and 1 deletions

View File

@ -617,7 +617,18 @@ class TestInvalidFD(unittest.TestCase):
def test_closerange(self): def test_closerange(self):
if hasattr(os, "closerange"): if hasattr(os, "closerange"):
fd = support.make_bad_fd() 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): def test_dup2(self):
if hasattr(os, "dup2"): if hasattr(os, "dup2"):