matplotlib · dstansby · Mar 4, 2018 · Dec 3, 2017 · Feb 15, 2018 · Feb 19, 2018
diff --git a/doc/api/next_api_changes/2018-02-15-DS.rst b/doc/api/next_api_changes/2018-02-15-DS.rst
@@ -0,0 +1,7 @@
+Deprecated methods removed from `matplotlib.testing`
+----------------------------------------------------
+
+The deprecated methods `knownfailureif` and `remove_text` have been removed
+from :mod:`matplotlib.testing.decorators`.
+
+The entire contents of `testing.noseclasses` have also been removed.
diff --git a/lib/matplotlib/testing/_nose/__init__.py b/lib/matplotlib/testing/_nose/__init__.py
diff --git a/lib/matplotlib/testing/_nose/decorators.py b/lib/matplotlib/testing/_nose/decorators.py
diff --git a/lib/matplotlib/testing/_nose/exceptions.py b/lib/matplotlib/testing/_nose/exceptions.py
diff --git a/lib/matplotlib/testing/_nose/plugins/__init__.py b/lib/matplotlib/testing/_nose/plugins/__init__.py
diff --git a/lib/matplotlib/testing/_nose/plugins/knownfailure.py b/lib/matplotlib/testing/_nose/plugins/knownfailure.py
diff --git a/lib/matplotlib/testing/_nose/plugins/performgc.py b/lib/matplotlib/testing/_nose/plugins/performgc.py
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -42,17 +42,13 @@ def _knownfailureif(fail_condition, msg=None, known_exception_class=None):
     if the exception is an instance of this class. (Default = None)
 
     """
-    if is_called_from_pytest():
-        import pytest
-        if fail_condition == 'indeterminate':
-            fail_condition, strict = True, False
-        else:
-            fail_condition, strict = bool(fail_condition), True
-        return pytest.mark.xfail(condition=fail_condition, reason=msg,
-                                 raises=known_exception_class, strict=strict)
+    import pytest
+    if fail_condition == 'indeterminate':
+        fail_condition, strict = True, False
     else:
-        from ._nose.decorators import knownfailureif
-        return knownfailureif(fail_condition, msg, known_exception_class)
+        fail_condition, strict = bool(fail_condition), True
+    return pytest.mark.xfail(condition=fail_condition, reason=msg,
+                             raises=known_exception_class, strict=strict)
 
 
 def _do_cleanup(original_units_registry, original_settings):

diff --git a/lib/matplotlib/testing/noseclasses.py b/lib/matplotlib/testing/noseclasses.py
diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py
@@ -78,105 +78,3 @@ def test_image_comparison_expect_rms(im1, im2, tol, expect_rms):
     else:
         assert results is not None
         assert results['rms'] == approx(expect_rms, abs=1e-4)
-
-
-# The following tests are used by test_nose_image_comparison to ensure that the
-# image_comparison decorator continues to work with nose. They should not be
-# prefixed by test_ so they don't run with pytest.
-
-
-def nosetest_empty():
-    pass
-
-
-def nosetest_simple_figure():
-    import matplotlib.pyplot as plt
-    fig, ax = plt.subplots(figsize=(6.4, 4), dpi=100)
-    ax.plot([1, 2, 3], [3, 4, 5])
-    return fig
-
-
-@pytest.mark.parametrize(
-    'func, kwargs, errors, failures, dots'
A3E2
,
-    [
-        (nosetest_empty, {'baseline_images': []}, [], [], ''),
-        (nosetest_empty, {'baseline_images': ['foo']},
-         [(AssertionError,
-           'Test generated 0 images but there are 1 baseline images')],
-         [],
-         'E'),
-        (nosetest_simple_figure,
-         {'baseline_images': ['basn3p02'], 'extensions': ['png'],
-          'remove_text': True},
-         [],
-         [(ImageComparisonFailure, 'Image sizes do not match expected size:')],
-         'F'),
-        (nosetest_simple_figure,
-         {'baseline_images': ['simple']},
-         [],
-         [(ImageComparisonFailure, 'images not close')] * 3,
-         'FFF'),
-        (nosetest_simple_figure,
-         {'baseline_images': ['simple'], 'remove_text': True},
-         [],
-         [],
-         '...'),
-    ],
-    ids=[
-        'empty',
-        'extra baselines',
-        'incorrect shape',
-        'failing figure',
-        'passing figure',
-    ])
-def test_nose_image_comparison(func, kwargs, errors, failures, dots,
-                               monkeypatch):
-    nose = pytest.importorskip('nose')
-    monkeypatch.setattr('matplotlib._called_from_pytest', False)
-
-    class TestResultVerifier(nose.result.TextTestResult):
-        def __init__(self, *args, **kwargs):
-            super().__init__(*args, **kwargs)
-            self.error_count = 0
-            self.failure_count = 0
-
-        def addError(self, test, err):
-            super().addError(test, err)
-
-            if self.error_count < len(errors):
-                assert err[0] is errors[self.error_count][0]
-                assert errors[self.error_count][1] in str(err[1])
-            else:
-                raise err[1]
-            self.error_count += 1
-
-        def addFailure(self, test, err):
-            super().addFailure(test, err)
-
-            assert self.failure_count < len(failures), err[1]
-            assert err[0] is failures[self.failure_count][0]
-            assert failures[self.failure_count][1] in str(err[1])
-            self.failure_count += 1
-
-    # Make sure that multiple extensions work, but don't require LaTeX or
-    # Inkscape to do so.
-    kwargs.setdefault('extensions', ['png', 'png', 'png'])
-
-    func = image_comparison(**kwargs)(func)
-    loader = nose.loader.TestLoader()
-    suite = loader.loadTestsFromGenerator(
-        func,
-        'matplotlib.tests.test_compare_images')
-    if six.PY2:
-        output = io.BytesIO()
-    else:
-        output = io.StringIO()
-    result = TestResultVerifier(stream=output, descriptions=True, verbosity=1)
-    with warnings.catch_warnings():
-        # Nose uses deprecated stuff; we don't care about it.
-        warnings.simplefilter('ignore', DeprecationWarning)
-        suite.run(result=result)
-
-    assert output.getvalue() == dots
-    assert result.error_count == len(errors)
-    assert result.failure_count == len(failures)