Merge pull request #7425 from tacaswell/backport_nose_fix

dopplershift · web-flow · commit 0e8967148608 · 2016-11-08T10:17:11.000-07:00
[MRG+1] Do not rely on outer scope variables in `ImageComparisonTest.test.do_…
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -237,7 +237,7 @@ def test(self):
                 @knownfailureif(
                     will_fail, fail_msg,
                     known_exception_class=ImageComparisonFailure)
-                def do_test():
+                def do_test(fignum, actual_fname, expected_fname):
                     figure = plt.figure(fignum)
 
                     if self._remove_text:
@@ -264,7 +264,7 @@ def do_test():
                                 (self._freetype_version, ft2font.__freetype_version__))
                         raise
 
-                yield (do_test,)
+                yield do_test, fignum, actual_fname, expected_fname
 
 def image_comparison(baseline_images=None, extensions=None, tol=0,
                      freetype_version=None, remove_text=False,
