Convert test_[ab]* files to pytest.

QuLogic · QuLogic · commit 675424c8bf2b · 2017-01-21T23:31:58.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1474,18 +1474,13 @@ def _jupyter_nbextension_paths():
 
 
 default_test_modules = [
-    'matplotlib.tests.test_agg',
-    'matplotlib.tests.test_arrow_patches',
-    'matplotlib.tests.test_artist',
     'matplotlib.tests.test_backend_bases',
     'matplotlib.tests.test_backend_pdf',
     'matplotlib.tests.test_backend_pgf',
     'matplotlib.tests.test_backend_ps',
     'matplotlib.tests.test_backend_qt4',
     'matplotlib.tests.test_backend_qt5',
     'matplotlib.tests.test_backend_svg',
-    'matplotlib.tests.test_basic',
-    'matplotlib.tests.test_bbox_tight',
     'matplotlib.tests.test_coding_standards',
     'matplotlib.tests.test_dviread',
     'matplotlib.tests.test_figure',
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -10,8 +10,7 @@
 
 import numpy as np
 from numpy.testing import assert_array_almost_equal
-
-from nose.tools import assert_raises
+import pytest
 
 from matplotlib.image import imread
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
@@ -297,9 +296,5 @@ def process_image(self, padded_src, dpi):
 def test_too_large_image():
     fig = plt.figure(figsize=(300, 1000))
     buff = io.BytesIO()
-    assert_raises(ValueError, fig.savefig, buff)
-
-
-if __name__ == "__main__":
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
+    with pytest.raises(ValueError):
+        fig.savefig(buff)
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
@@ -121,8 +121,3 @@ def test_fancyarrow_dash():
                          color='k')
     ax.add_patch(e)
     ax.add_patch(e2)
-
-
-if __name__ == '__main__':
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
@@ -17,8 +17,6 @@
 import matplotlib as mpl
 from matplotlib.testing.decorators import image_comparison, cleanup
 
-from nose.tools import (assert_true, assert_false)
-
 
 @cleanup
 def test_patch_transform_of_none():
@@ -184,28 +182,28 @@ def test_remove():
     im = ax.imshow(np.arange(36).reshape(6, 6))
     ln, = ax.plot(range(5))
 
-    assert_true(fig.stale)
-    assert_true(ax.stale)
+    assert fig.stale
+    assert ax.stale
 
     fig.canvas.draw()
-    assert_false(fig.stale)
-    assert_false(ax.stale)
-    assert_false(ln.stale)
+    assert not fig.stale
+    assert not ax.stale
+    assert not ln.stale
 
-    assert_true(im in ax.mouseover_set)
-    assert_true(ln not in ax.mouseover_set)
-    assert_true(im.axes is ax)
+    assert im in ax.mouseover_set
+    assert ln not in ax.mouseover_set
+    assert im.axes is ax
 
     im.remove()
     ln.remove()
 
     for art in [im, ln]:
-        assert_true(art.axes is None)
-        assert_true(art.figure is None)
+        assert art.axes is None
+        assert art.figure is None
 
-    assert_true(im not in ax.mouseover_set)
-    assert_true(fig.stale)
-    assert_true(ax.stale)
+    assert im not in ax.mouseover_set
+    assert fig.stale
+    assert ax.stale
 
 
 @image_comparison(baseline_images=["default_edges"], remove_text=True,
@@ -254,8 +252,3 @@ def test_setp():
     sio = io.StringIO()
     plt.setp(lines1, 'zorder', file=sio)
     assert sio.getvalue() == '  zorder: any number \n'
-
-
-if __name__ == '__main__':
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
@@ -6,8 +6,6 @@
 
 import warnings
 
-from nose.tools import assert_equal
-
 from ..testing.decorators import knownfailureif, skipif
 
 
@@ -19,13 +17,13 @@ def setup_module():
 
 
 def test_simple():
-    assert_equal(1 + 1, 2)
+    assert 1 + 1 == 2
 
 
 @knownfailureif(True)
 def test_simple_knownfail():
     # Test the known fail mechanism.
-    assert_equal(1 + 1, 3)
+    assert 1 + 1 == 3
 
 
 @skipif(True, reason="skipif decorator test with bool condition passed")
@@ -91,8 +89,3 @@ def test_override_builtins():
                 overridden = True
 
     assert not overridden
-
-
-if __name__ == '__main__':
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
@@ -93,7 +93,3 @@ def test_bbox_inches_tight_raster():
     fig = plt.figure()
     ax = fig.add_subplot(111)
     ax.plot([1.0, 2.0], rasterized=True)
-
-if __name__ == '__main__':
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
