Kojoley
diff --git a/‎conftest.py
Lines changed: 27 additions & 0 deletions b/‎conftest.py
Lines changed: 27 additions & 0 deletions
diff --git a/‎lib/matplotlib/testing/__init__.py
Lines changed: 20 additions & 4 deletions b/‎lib/matplotlib/testing/__init__.py
Lines changed: 20 additions & 4 deletions
diff --git a/‎lib/matplotlib/testing/decorators.py
Lines changed: 16 additions & 6 deletions b/‎lib/matplotlib/testing/decorators.py
Lines changed: 16 additions & 6 deletions
@@ -0,0 +1,27 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+import inspect
+import pytest
+
+import matplotlib
+matplotlib.use('agg')
+
+from matplotlib.testing.decorators import ImageComparisonTest
+
+
+def pytest_configure(config):
+    matplotlib._called_from_pytest = True
+
+
+def pytest_unconfigure(config):
+    matplotlib._called_from_pytest = False
+
+
+def pytest_pycollect_makeitem(collector, name, obj):
+    if inspect.isclass(obj):
+        if issubclass(obj, ImageComparisonTest):
+            # Workaround `image_compare` decorator as it returns class
+            # instead of function and this confuses pytest because it crawls
+            # original names and sees 'test_*', but not 'Test*' in that case
+            return pytest.Class(name, parent=collector)
@@ -5,6 +5,7 @@
 import warnings
 from contextlib import contextmanager
 
+import matplotlib
 from matplotlib.cbook import is_string_like, iterable
 from matplotlib import rcParams, rcdefaults, use
 
@@ -14,16 +15,31 @@ def _is_list_like(obj):
     return not is_string_like(obj) and iterable(obj)
 
 
+def is_called_from_pytest():
+    """Returns whether the call was done from pytest"""
+    return getattr(matplotlib, '_called_from_pytest', False)
+
+
 def xfail(msg=""):
     """Explicitly fail an currently-executing test with the given message."""
-    from .nose import knownfail
-    knownfail(msg)
+    __tracebackhide__ = True
+    if is_called_from_pytest():
+        import pytest
+        pytest.xfail(msg)
+    else:
+        from .nose import knownfail
+        knownfail(msg)
 
 
 def skip(msg=""):
     """Skip an executing test with the given message."""
-    from nose import SkipTest
-    raise SkipTest(msg)
+    __tracebackhide__ = True
+    if is_called_from_pytest():
+        import pytest
+        pytest.skip(msg)
+    else:
+        from nose import SkipTest
+        raise SkipTest(msg)
 
 
 # stolen from pytest
 
@@ -27,7 +27,7 @@
 from matplotlib import rcParams
 from matplotlib.testing.compare import comparable_formats, compare_images, \
      make_test_filename
-from . import copy_metadata, skip, xfail
+from . import copy_metadata, is_called_from_pytest, skip, xfail
 from .exceptions import ImageComparisonFailure
 
 
@@ -37,8 +37,12 @@ def skipif(condition, *args, **kwargs):
 
     Optionally specify a reason for better reporting.
     """
-    from .nose.decorators import skipif
-    return skipif(condition, *args, **kwargs)
+    if is_called_from_pytest():
+        import pytest
+        return pytest.mark.skipif(condition, *args, **kwargs)
+    else:
+        from .nose.decorators import skipif
+        return skipif(condition, *args, **kwargs)
 
 
 def knownfailureif(fail_condition, msg=None, known_exception_class=None):
@@ -53,8 +57,14 @@ def knownfailureif(fail_condition, msg=None, known_exception_class=None):
     if the exception is an instance of this class. (Default = None)
 
     """
-    from .nose.decorators import knownfailureif
-    return knownfailureif(fail_condition, msg, known_exception_class)
+    if is_called_from_pytest():
+        import pytest
+        strict = fail_condition and fail_condition != 'indeterminate'
+        return pytest.mark.xfail(condition=fail_condition, reason=msg,
+                                 raises=known_exception_class, strict=strict)
+    else:
+        from .nose.decorators import knownfailureif
+        return knownfailureif(fail_condition, msg, known_exception_class)
 
 
 def _do_cleanup(original_units_registry, original_settings):
@@ -198,7 +208,7 @@ def remove_text(figure):
     def test(self):
         baseline_dir, result_dir = _image_directories(self._func)
         if self._style != 'classic':
-            xfail('temporarily disabled until 2.0 tag')
+            skip('temporarily disabled until 2.0 tag')
         for fignum, baseline in zip(plt.get_fignums(), self._baseline_images):
             for extension in self._extensions:
                 will_fail = not extension in comparable_formats()