Merge pull request #15589 from MarcoGorelli/close-plots-in-check-figures-equal

dopplershift · web-flow · commit 4ddf00401314 · 2019-11-02T13:31:40.000-04:00
Make sure that figures are closed when check_figures_equal finishes
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -389,18 +389,22 @@ def decorator(func):
 
         @pytest.mark.parametrize("ext", extensions)
         def wrapper(*args, ext, **kwargs):
-            fig_test = plt.figure("test")
-            fig_ref = plt.figure("reference")
-            func(*args, fig_test=fig_test, fig_ref=fig_ref, **kwargs)
-            test_image_path = result_dir / (func.__name__ + "." + ext)
-            ref_image_path = result_dir / (
-                func.__name__ + "-expected." + ext
-            )
-            fig_test.savefig(test_image_path)
-            fig_ref.savefig(ref_image_path)
-            _raise_on_image_difference(
-                ref_image_path, test_image_path, tol=tol
-            )
+            try:
+                fig_test = plt.figure("test")
+                fig_ref = plt.figure("reference")
+                func(*args, fig_test=fig_test, fig_ref=fig_ref, **kwargs)
+                test_image_path = result_dir / (func.__name__ + "." + ext)
+                ref_image_path = result_dir / (
+                    func.__name__ + "-expected." + ext
+                )
+                fig_test.savefig(test_image_path)
+                fig_ref.savefig(ref_image_path)
+                _raise_on_image_difference(
+                    ref_image_path, test_image_path, tol=tol
+                )
+            finally:
+                plt.close(fig_test)
+                plt.close(fig_ref)
 
         sig = inspect.signature(func)
         new_sig = sig.replace(
