Merge an amended version of #876.

Ensure idfile is closed if an error occurs.
nose-devs · Nov 28, 2015 · 05882fa · 05882fa
2 parents c303c5d + 16df8f4
commit 05882fa
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/nose/plugins/testid.py b/nose/plugins/testid.py
@@ -178,31 +178,33 @@ def loadTestsFromNames(self, names, module=None):
         log.debug('ltfn %s %s', names, module)
         try:
             fh = open(self.idfile, 'rb')
-            data = load(fh)
-            if 'ids' in data:
-                self.ids = data['ids']
-                self.failed = data['failed']
-                self.source_names = data['source_names']
-            else:
-                # old ids field
-                self.ids = data
-                self.failed = []
-                self.source_names = names
-            if self.ids:
-                self.id = max(self.ids) + 1
-                self.tests = dict(list(zip(list(self.ids.values()), list(self.ids.keys()))))
-            else:
-                self.id = 1
-            log.debug(
-                'Loaded test ids %s tests %s failed %s sources %s from %s',
-                self.ids, self.tests, self.failed, self.source_names,
-                self.idfile)
-            fh.close()
-        except ValueError, e:
-            # load() may throw a ValueError when reading the ids file, if it
-            # was generated with a newer version of Python than we are currently
-            # running.
-            log.debug('Error loading %s : %s', self.idfile, str(e))
+            try:
+                data = load(fh)
+                if 'ids' in data:
+                    self.ids = data['ids']
+                    self.failed = data['failed']
+                    self.source_names = data['source_names']
+                else:
+                    # old ids field
+                    self.ids = data
+                    self.failed = []
+                    self.source_names = names
+                if self.ids:
+                    self.id = max(self.ids) + 1
+                    self.tests = dict(list(zip(list(self.ids.values()), list(self.ids.keys()))))
+                else:
+                    self.id = 1
+                log.debug(
+                    'Loaded test ids %s tests %s failed %s sources %s from %s',
+                    self.ids, self.tests, self.failed, self.source_names,
+                    self.idfile)
+            except ValueError, e:
+                # load() may throw a ValueError when reading the ids file, if it
+                # was generated with a newer version of Python than we are currently
+                # running.
+                log.debug('Error loading %s : %s', self.idfile, str(e))
+            finally:
+                fh.close()
         except IOError:
             log.debug('IO error reading %s', self.idfile)