Skip to content

Fixed error handling in ImageComparisonTest.setup_class #6754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2016
Merged

Fixed error handling in ImageComparisonTest.setup_class #6754

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions lib/matplotlib/testing/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down