TST: Use new method for applying pytest markers.

QuLogic · ArchangeGabriel · commit bd7e7298a0a0 · 2019-01-17T19:19:53.000+01:00
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -224,20 +224,24 @@ def _xfail_if_format_is_uncomparable(extension):
 def _mark_xfail_if_format_is_uncomparable(extension):
     if isinstance(extension, six.string_types):
         name = extension
+        marks = []
     elif isinstance(extension, tuple):
         # Extension might be a pytest ParameterSet instead of a plain string.
         # Unfortunately, this type is not exposed, so since it's a namedtuple,
         # check for a tuple instead.
         name = extension.values[0]
+        marks = list(extension.marks)
     else:
         # Extension might be a pytest marker instead of a plain string.
         name = extension.args[0]
+        marks = [extension.mark]
 
     if name not in comparable_formats():
         fail_msg = 'Cannot compare %s files on this system' % (name, )
         import pytest
-        return pytest.mark.xfail(extension, reason=fail_msg, strict=False,
-                                 raises=ImageComparisonFailure)
+        marks += [pytest.mark.xfail(reason=fail_msg, strict=False,
+                                    raises=ImageComparisonFailure)]
+        return pytest.param(name, marks=marks)
     else:
         return extension
 
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -125,9 +125,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)
