From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 3 Jul 2019 09:31:39 +0000 (-0700)
Subject: bpo-37421: test_winconsoleio doesn't leak temp file anymore (GH-14562)
X-Git-Tag: v3.8.0b2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2a807f75dc162dfb45fb297aee4961de8008f84;p=thirdparty%2FPython%2Fcpython.git

bpo-37421: test_winconsoleio doesn't leak temp file anymore (GH-14562)


test_winconsoleio doesn't leak a temporary file anymore: use
tempfile.TemporaryFile() to remove it when the test completes.
(cherry picked from commit b71d8d67959f3b5efbdfe00066589ac0d8f98aad)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
---

diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py
index a78fa4d7d919..9a61e48881d9 100644
--- a/Lib/test/test_winconsoleio.py
+++ b/Lib/test/test_winconsoleio.py
@@ -25,14 +25,12 @@ class WindowsConsoleIOTests(unittest.TestCase):
         self.assertRaisesRegex(ValueError,
             "negative file descriptor", ConIO, -1)
 
-        fd, _ = tempfile.mkstemp()
-        try:
+        with tempfile.TemporaryFile() as tmpfile:
+            fd = tmpfile.fileno()
             # Windows 10: "Cannot open non-console file"
             # Earlier: "Cannot open console output buffer for reading"
             self.assertRaisesRegex(ValueError,
                 "Cannot open (console|non-console file)", ConIO, fd)
-        finally:
-            os.close(fd)
 
         try:
             f = ConIO(0)
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
new file mode 100644
index 000000000000..6671ffe922fd
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
@@ -0,0 +1,2 @@
+test_winconsoleio doesn't leak a temporary file anymore: use
+tempfile.TemporaryFile() to remove it when the test completes.