From bda6e6aa64a1cd5e2303d2ff68bbddf61f0aabf4 Mon Sep 17 00:00:00 2001 From: Nikita Kniazev Date: Sat, 16 Jul 2016 12:27:05 +0300 Subject: [PATCH] Fixed error handling in `ImageComparisonTest.setup_class` --- lib/matplotlib/testing/decorators.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py index a85136bb72f..ffa17173c9f 100644 --- 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):