Merge pull request #3312 from matthew-brett/fix-ghostscript-skip

tacaswell · tacaswell · commit 3540dff6fcc7 · 2014-07-26T22:50:32.000-04:00
BUG: fix test error when ghostscript not installed
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -7,11 +7,20 @@
 import re
 
 import six
-from nose.plugins.skip import SkipTest
 
 import matplotlib
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import cleanup
+from matplotlib.testing.decorators import cleanup, knownfailureif
+
+
+needs_ghostscript = knownfailureif(
+    matplotlib.checkdep_ghostscript()[0] is None,
+    "This test needs a ghostscript installation")
+
+
+needs_tex = knownfailureif(
+    not matplotlib.checkdep_tex(),
+    "This test needs a TeX installation")
 
 
 def _test_savefig_to_stringio(format='ps'):
@@ -50,18 +59,15 @@ def test_savefig_to_stringio():
 
 
 @cleanup
+@needs_ghostscript
 def test_savefig_to_stringio_with_distiller():
-    if not matplotlib.checkdep_ghostscript():
-        raise SkipTest("This test requires a GhostScript installation")
     matplotlib.rcParams['ps.usedistiller'] = 'ghostscript'
     _test_savefig_to_stringio()
 
 
 @cleanup
+@needs_tex
 def test_savefig_to_stringio_with_usetex():
-    if not matplotlib.checkdep_tex():
-        raise SkipTest("This test requires a TeX installation")
-
     matplotlib.rcParams['text.latex.unicode'] = True
     matplotlib.rcParams['text.usetex'] = True
     _test_savefig_to_stringio()
@@ -73,10 +79,8 @@ def test_savefig_to_stringio_eps():
 
 
 @cleanup
+@needs_tex
 def test_savefig_to_stringio_with_usetex_eps():
-    if not matplotlib.checkdep_tex():
-        raise SkipTest("This test requires a TeX installation")
-
     matplotlib.rcParams['text.latex.unicode'] = True
     matplotlib.rcParams['text.usetex'] = True
     _test_savefig_to_stringio(format='eps')
