Merge pull request #6754 from Kojoley/fix-error-handling-in-imagecomparisontest

mdboom · web-flow · commit efc2402056db · 2016-07-16T11:12:37.000-04:00
Fixed error handling in `ImageComparisonTest.setup_class`
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -180,17 +180,14 @@ class ImageComparisonTest(CleanupTest):
     @classmethod
     def setup_class(cls):
         CleanupTest.setup_class()
-        cls._initial_settings = mpl.rcParams.copy()
         try:
             matplotlib.style.use(cls._style)
+            matplotlib.testing.set_font_settings_for_testing()
+            cls._func()
         except:
             # Restore original settings before raising errors during the update.
-            mpl.rcParams.clear()
-            mpl.rcParams.update(cls._initial_settings)
+            CleanupTest.teardown_class()
             raise
-        cls.original_settings = cls._initial_settings
-        matplotlib.testing.set_font_settings_for_testing()
-        cls._func()
 
     @classmethod
     def teardown_class(cls):
