From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 10 Jun 2013 15:27:45 +0000 (+0100)
Subject: Issue #18174: Fix fd leaks in tests.
X-Git-Tag: v2.7.6rc1~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=045e4579928768c0c40ae174aaa3bec1a53dc431;p=thirdparty%2FPython%2Fcpython.git

Issue #18174: Fix fd leaks in tests.
---

diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py
index 20c4fe239c2f..4b34b3a3c779 100644
--- a/Lib/test/test_openpty.py
+++ b/Lib/test/test_openpty.py
@@ -10,6 +10,8 @@ if not hasattr(os, "openpty"):
 class OpenptyTest(unittest.TestCase):
     def test(self):
         master, slave = os.openpty()
+        self.addCleanup(os.close, master)
+        self.addCleanup(os.close, slave)
         if not os.isatty(slave):
             self.fail("Slave-end of pty is not a terminal.")
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index e89d84f49035..f43b51caf832 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -806,7 +806,8 @@ class POSIXProcessTestCase(BaseTestCase):
                         self._testcase.assertNotIn(
                                 fd, (p2cwrite, c2pread, errread))
                 finally:
-                    map(os.close, devzero_fds)
+                    for fd in devzero_fds:
+                        os.close(fd)
 
     @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
     def test_preexec_errpipe_does_not_double_close_pipes(self):
diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
index 6fe2fe5edb31..9de3d789c5e2 100644
--- a/Lib/test/test_uuid.py
+++ b/Lib/test/test_uuid.py
@@ -448,6 +448,7 @@ class TestUUID(unittest.TestCase):
 
         else:
             os.close(fds[1])
+            self.addCleanup(os.close, fds[0])
             parent_value = uuid.uuid4().hex
             os.waitpid(pid, 0)
             child_value = os.read(fds[0], 100)