From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 27 Jul 2009 01:14:38 +0000 (+0000)
Subject: Remove unittest.SkipTest from backport of test for issue 6542.
X-Git-Tag: v2.6.3rc1~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bce6d5e129596c64aae091ecb763693c91f2ee0e;p=python

Remove unittest.SkipTest from backport of test for issue 6542.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 6d90f84158..b3f72f4787 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -565,8 +565,9 @@ class TestInvalidFD(unittest.TestCase):
                 else:
                     break
             if i < 2:
-                raise unittest.SkipTest(
-                    "Unable to acquire a range of invalid file descriptors")
+                # Unable to acquire a range of invalid file descriptors,
+                # so skip the test (in 2.6+ this is a unittest.SkipTest).
+                return
             self.assertEqual(os.closerange(fd, fd + i-1), None)
 
     def test_dup2(self):