Convert cleanup decorator into autouse fixture.

QuLogic · QuLogic · commit a565a5b2199a · 2017-01-30T18:46:48.000-05:00
Any non-default styles can be specified with
`@pytest.mark.style('name')`.
diff --git a/lib/matplotlib/sphinxext/tests/conftest.py b/lib/matplotlib/sphinxext/tests/conftest.py
@@ -0,0 +1,4 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+from matplotlib.tests.conftest import mpl_test_settings
diff --git a/lib/matplotlib/tests/conftest.py b/lib/matplotlib/tests/conftest.py
@@ -0,0 +1,28 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+import pytest
+
+import matplotlib
+
+
+@pytest.fixture(autouse=True)
+def mpl_test_settings(request):
+    from matplotlib.testing.decorators import _do_cleanup
+
+    original_units_registry = matplotlib.units.registry.copy()
+    original_settings = matplotlib.rcParams.copy()
+
+    style = 'classic'
+    style_marker = request.keywords.get('style')
+    if style_marker is not None:
+        assert len(style_marker.args) == 1, \
+            "Marker 'style' must specify 1 style."
+        style = style_marker.args[0]
+
+    matplotlib.style.use(style)
+    try:
+        yield
+    finally:
+        _do_cleanup(original_units_registry,
+                    original_settings)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -200,7 +200,7 @@ def test_autoscale_tiny_range():
         ax[i].plot([0, 1], [1, 1 + y1])
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_autoscale_tight():
     fig, ax = plt.subplots(1, 1)
     ax.plot([1, 2, 3, 4])
@@ -210,7 +210,7 @@ def test_autoscale_tight():
     assert_allclose(ax.get_ylim(), (1.0, 4.0))
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_autoscale_log_shared():
     # related to github #7587
     # array starts at zero to trigger _minpos handling
@@ -228,7 +228,7 @@ def test_autoscale_log_shared():
     assert_allclose(ax2.get_ylim(), (x[0], x[-1]))
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_use_sticky_edges():
     fig, ax = plt.subplots()
     ax.imshow([[0, 1], [2, 3]], origin='lower')
@@ -4573,7 +4573,7 @@ def test_loglog():
     ax.tick_params(length=15, width=2, which='minor')
 
 
-@cleanup('default')
+@pytest.mark.style('default')
 def test_axes_margins():
     fig, ax = plt.subplots()
     ax.plot([0, 1, 2, 3])
@@ -4924,7 +4924,7 @@ def test_fill_betweenx_2d_x2_input():
         ax.fill_betweenx(y, x1, x2)
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_fillbetween_cycle():
     fig, ax = plt.subplots()
 
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -12,8 +12,7 @@
 import matplotlib.pyplot as plt
 from matplotlib.compat import subprocess
 from matplotlib.testing.compare import compare_images, ImageComparisonFailure
-from matplotlib.testing.decorators import (_image_directories, switch_backend,
-                                           cleanup)
+from matplotlib.testing.decorators import _image_directories, switch_backend
 
 baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
 
@@ -83,7 +82,7 @@ def create_figure():
 
 # test compiling a figure to pdf with xelatex
 @needs_xelatex
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @switch_backend('pgf')
 def test_xelatex():
     rc_xelatex = {'font.family': 'serif',
@@ -95,7 +94,7 @@ def test_xelatex():
 
 # test compiling a figure to pdf with pdflatex
 @needs_pdflatex
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @switch_backend('pgf')
 def test_pdflatex():
     import os
@@ -117,7 +116,7 @@ def test_pdflatex():
 # test updating the rc parameters for each figure
 @needs_xelatex
 @needs_pdflatex
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @switch_backend('pgf')
 def test_rcupdate():
     rc_sets = []
@@ -148,7 +147,7 @@ def test_rcupdate():
 
 # test backend-side clipping, since large numbers are not supported by TeX
 @needs_xelatex
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @switch_backend('pgf')
 def test_pathclip():
     rc_xelatex = {'font.family': 'serif',
@@ -165,7 +164,7 @@ def test_pathclip():
 
 # test mixed mode rendering
 @needs_xelatex
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @switch_backend('pgf')
 def test_mixedmode():
     rc_xelatex = {'font.family': 'serif',
@@ -180,7 +179,7 @@ def test_mixedmode():
 
 # test bbox_inches clipping
 @needs_xelatex
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @switch_backend('pgf')
 def test_bbox_inches():
     rc_xelatex = {'font.family': 'serif',
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -635,7 +635,7 @@ def test_pandas_indexing():
     Collection(antialiaseds=aa)
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_lslw_bcast():
     col = mcollections.PathCollection([])
     col.set_linestyles(['-', '-'])
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
@@ -8,6 +8,7 @@
 
 import numpy as np
 from numpy.testing import assert_almost_equal, assert_array_equal
+import pytest
 
 from matplotlib.patches import Polygon
 from matplotlib.patches import Rectangle
@@ -174,7 +175,7 @@ def test_patch_alpha_override():
     ax.set_ylim([-1, 2])
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_patch_color_none():
     # Make sure the alpha kwarg does not override 'none' facecolor.
     # Addresses issue #7478.
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -13,7 +13,7 @@
 import warnings
 
 
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 def test_MaxNLocator():
     loc = mticker.MaxNLocator(nbins=5)
     test_value = np.array([20., 40., 60., 80., 100.])
@@ -174,7 +174,7 @@ def test_SymmetricalLogLocator_set_params():
     assert sym.numticks == 8
 
 
-@cleanup(style='classic')
+@pytest.mark.style('classic')
 @pytest.mark.parametrize('left, right, offset',
                          [(123, 189, 0),
                           (-189, -123, 0),
@@ -240,7 +240,7 @@ def _sub_labels(axis, subs=()):
     assert label_test == label_expected
 
 
-@cleanup(style='default')
+@pytest.mark.style('default')
 def test_LogFormatter_sublabel():
     # test label locator
     fig, ax = plt.subplots()
@@ -318,6 +318,7 @@ def test_LogFormatterExponent_blank():
     assert formatter(10**0.1) == ''
 
 
+@pytest.mark.style('default')
 def test_LogFormatterSciNotation():
     test_cases = {
         10: (
diff --git a/lib/mpl_toolkits/tests/conftest.py b/lib/mpl_toolkits/tests/conftest.py
@@ -0,0 +1,4 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+from matplotlib.tests.conftest import mpl_test_settings
