Merge pull request #4790 from OceanWolf/test_cleanup

efiring · efiring · commit a1f96a514f06 · 2015-07-25T10:03:43.000-10:00
Test Cleanup Closes #4772
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -14,6 +14,7 @@
 import nose
 import numpy as np
 
+import matplotlib as mpl
 import matplotlib.tests
 import matplotlib.units
 from matplotlib import cbook
@@ -329,3 +330,19 @@ def find_dotted_module(module_name, path=None):
         cbook.mkdirs(result_dir)
 
     return baseline_dir, result_dir
+
+
+def switch_backend(backend):
+    def switch_backend_decorator(func):
+        def backend_switcher(*args, **kwargs):
+            try:
+                prev_backend = mpl.get_backend()
+                matplotlib.tests.setup()
+                plt.switch_backend(backend)
+                result = func(*args, **kwargs)
+            finally:
+                plt.switch_backend(prev_backend)
+            return result
+
+        return nose.tools.make_decorator(func)(backend_switcher)
+    return switch_backend_decorator
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -15,7 +15,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
+from matplotlib.testing.decorators import _image_directories, switch_backend
 
 
 baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
@@ -41,23 +41,6 @@ def check_for(texsystem):
     return latex.returncode == 0
 
 
-def switch_backend(backend):
-
-    def switch_backend_decorator(func):
-        def backend_switcher(*args, **kwargs):
-            try:
-                prev_backend = mpl.get_backend()
-                mpl.rcdefaults()
-                plt.switch_backend(backend)
-                result = func(*args, **kwargs)
-            finally:
-                plt.switch_backend(prev_backend)
-            return result
-
-        return nose.tools.make_decorator(func)(backend_switcher)
-    return switch_backend_decorator
-
-
 def compare_figure(fname, savefig_kwargs={}):
     actual = os.path.join(result_dir, fname)
     plt.savefig(actual, **savefig_kwargs)
diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py
@@ -4,7 +4,7 @@
 from matplotlib.externals import six
 from matplotlib.externals.six import unichr
 from matplotlib import pyplot as plt
-from matplotlib.testing.decorators import cleanup
+from matplotlib.testing.decorators import cleanup, switch_backend
 from matplotlib.testing.decorators import knownfailureif
 from matplotlib._pylab_helpers import Gcf
 import copy
@@ -31,10 +31,8 @@
 
 @cleanup
 @knownfailureif(not HAS_QT)
+@switch_backend('Qt4Agg')
 def test_fig_close():
-    # force switch to the Qt4 backend
-    plt.switch_backend('Qt4Agg')
-
     #save the state of Gcf.figs
     init_figs = copy.copy(Gcf.figs)
 
@@ -50,14 +48,14 @@ def test_fig_close():
     assert(init_figs == Gcf.figs)
 
 
+@switch_backend('Qt4Agg')
 def assert_correct_key(qt_key, qt_mods, answer):
     """
     Make a figure
     Send a key_press_event event (using non-public, qt4 backend specific api)
     Catch the event
     Assert sent and caught keys are the same
     """
-    plt.switch_backend('Qt4Agg')
     qt_canvas = plt.figure().canvas
 
     event = mock.Mock()
