TST: Use new method for applying pytest markers.

QuLogic · QuLogic · commit 7877939b2574 · 2018-09-27T22:40:41.000-04:00
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -170,8 +170,9 @@ def _mark_xfail_if_format_is_uncomparable(extension):
     if will_fail:
         fail_msg = 'Cannot compare %s files on this system' % extension
         import pytest
-        return pytest.mark.xfail(extension, reason=fail_msg, strict=False,
+        mark = pytest.mark.xfail(reason=fail_msg, strict=False,
                                  raises=ImageComparisonFailure)
+        return pytest.param(extension, marks=mark)
     else:
         return extension
 
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -133,9 +133,10 @@ def test_lines3d():
 
 
 # Reason for flakiness of SVG test is still unknown.
-@image_comparison(baseline_images=['mixedsubplot'], remove_text=True,
-                  extensions=['png', 'pdf',
-                              pytest.mark.xfail('svg', strict=False)])
+@image_comparison(
+    baseline_images=['mixedsubplot'], remove_text=True,
+    extensions=['png', 'pdf',
+                pytest.param('svg', marks=pytest.mark.xfail(strict=False))])
 def test_mixedsubplots():
     def f(t):
         s1 = np.cos(2*np.pi*t)
