From d274920ccff7ef37e610048df101ce5b57015c54 2018-05-16 20:48:27
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2018-05-16 20:48:27
Subject: [PATCH] Merge pull request #11134 from Carreau/fix-fleaks

Leak less files during test.
---

diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 83fb1b7..59dc15b 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -270,20 +270,25 @@ class TempFileMixin(object):
     def mktmp(self, src, ext='.py'):
         """Make a valid python temp file."""
         fname, f = temp_pyfile(src, ext)
-        self.tmpfile = f
+        if not hasattr(self, 'tmps'):
+            self.tmps=[]
+        self.tmps.append((f, fname))
         self.fname = fname
 
     def tearDown(self):
-        if hasattr(self, 'tmpfile'):
-            # If the tmpfile wasn't made because of skipped tests, like in
-            # win32, there's nothing to cleanup.
-            self.tmpfile.close()
-            try:
-                os.unlink(self.fname)
-            except:
-                # On Windows, even though we close the file, we still can't
-                # delete it.  I have no clue why
-                pass
+        # If the tmpfile wasn't made because of skipped tests, like in
+        # win32, there's nothing to cleanup.
+        if hasattr(self, 'tmps'):
+            for f,fname in self.tmps:
+                # If the tmpfile wasn't made because of skipped tests, like in
+                # win32, there's nothing to cleanup.
+                f.close()
+                try:
+                    os.unlink(fname)
+                except:
+                    # On Windows, even though we close the file, we still can't
+                    # delete it.  I have no clue why
+                    pass
 
     def __enter__(self):
         return self