Correctly keep track of used tmp files

theano/tensor/tests/test_basic.py

@@ -216,22 +216,25 @@ def makeTester(name, op, expected, checks=None, good=None, bad_build=None,
         def setUp(self):
             # Verify that the test's name is correctly set.
             assert eval(self.__class__.__name__) is self.__class__
+
+            # We keep a list of temporary files created in add_memmap_values,
+            # to remove them at the end of the test.
+            self.tmp_files = []
+
+        def add_memmap_values(self, val_dict):
             # If test_memmap is True, we create a temporary file
-            # containing a copy of the data passed in the "good" dict,
-            # then open it as a memmapped array, and use the result as a
+            # containing a copy of the data passed in the "val_dict" dict,
+            # then open it as a memmapped array, and we can use the result as a
             # new test value.
-            # We keep a list of temporary files created, to remove them
-            # at the end of the test.
-            self.tmp_files = []
             if not self.test_memmap:
-                return
+                return val_dict
 
             # Copy dict before modifying them
-            self.good = self.good.copy()
+            val_dict = val_dict.copy()
 
-            for k, v in self.good.items():
+            for k, v in val_dict.items():
                 new_k = '_'.join((k, 'memmap'))
-                if new_k in self.good:
+                if new_k in val_dict:
                     # A corresponding key was already provided
                     break
 
@@ -246,10 +249,11 @@ def makeTester(name, op, expected, checks=None, good=None, bad_build=None,
                         new_v.append(new_inp)
                     else:
                         new_v.append(inp)
-                self.good[new_k] = new_v
+                val_dict[new_k] = new_v
 
                 # We only need one value, no need to copy all of them
                 break
+            return val_dict
 
         def tearDown(self):
             for f, fname in self.tmp_files:
@@ -259,7 +263,10 @@ def makeTester(name, op, expected, checks=None, good=None, bad_build=None,
         def test_good(self):
             if skip:
                 raise SkipTest(skip)
-            for testname, inputs in self.good.items():
+
+            good = self.add_memmap_values(self.good)
+
+            for testname, inputs in good.items():
                 inputs = [copy(input) for input in inputs]
                 inputrs = [TensorType(
                             dtype=input.dtype,
@@ -286,7 +293,7 @@ def makeTester(name, op, expected, checks=None, good=None, bad_build=None,
                         and testname in self.expected):
                     expecteds = self.expected[testname]
                     # with numpy version, when we print a number and read it
-                    # back, we don't get exactly the same result #So we accept
+                    # back, we don't get exactly the same result, so we accept
                     # rounding error in that case.
                     eps = 5e-9
                 else: