Merge pull request #16545 from anntzer/xpdftest

timhoffm · web-flow · commit b08ab4349ac1 · 2020-02-18T22:16:07.000+01:00
Add a smoketest for ps.usedistiller="xpdf".
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -72,6 +72,7 @@ steps:
         libgirepository-1.0.1 \
         lmodern \
         fonts-freefont-otf \
+        poppler-utils \
         texlive-pictures \
         texlive-fonts-recommended \
         texlive-latex-base \
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -23,17 +23,16 @@
 @pytest.mark.parametrize('orientation', ['portrait', 'landscape'])
 @pytest.mark.parametrize('format, use_log, rcParams', [
     ('ps', False, {}),
-    pytest.param('ps', False, {'ps.usedistiller': 'ghostscript'},
-                 marks=needs_ghostscript),
-    pytest.param('ps', False, {'text.usetex': True},
-                 marks=[needs_ghostscript, needs_usetex]),
+    ('ps', False, {'ps.usedistiller': 'ghostscript'}),
+    ('ps', False, {'ps.usedistiller': 'xpdf'}),
+    ('ps', False, {'text.usetex': True}),
     ('eps', False, {}),
     ('eps', True, {'ps.useafm': True}),
-    pytest.param('eps', False, {'text.usetex': True},
-                 marks=[needs_ghostscript, needs_usetex]),
+    ('eps', False, {'text.usetex': True}),
 ], ids=[
     'ps',
-    'ps with distiller',
+    'ps with distiller=ghostscript',
+    'ps with distiller=xpdf',
     'ps with usetex',
     'eps',
     'eps afm',
@@ -56,8 +55,16 @@ def test_savefig_to_stringio(format, use_log, rcParams, orientation,
         if not mpl.rcParams["text.usetex"]:
             title += " \N{MINUS SIGN}\N{EURO SIGN}"
         ax.set_title(title)
-        fig.savefig(s_buf, format=format, orientation=orientation)
-        fig.savefig(b_buf, format=format, orientation=orientation)
+        allowable_exceptions = []
+        if rcParams.get("ps.usedistiller"):
+            allowable_exceptions.append(mpl.ExecutableNotFoundError)
+        if rcParams.get("text.usetex"):
+            allowable_exceptions.append(RuntimeError)
+        try:
+            fig.savefig(s_buf, format=format, orientation=orientation)
+            fig.savefig(b_buf, format=format, orientation=orientation)
+        except tuple(allowable_exceptions) as exc:
+            pytest.skip(str(exc))
 
         s_val = s_buf.getvalue().encode('ascii')
         b_val = b_buf.getvalue()
