pytest changes

ianthomas23 · ianthomas23 · commit d716c7bcf3a3 · 2017-03-09T08:09:12.000Z
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -46,10 +46,9 @@ def test_contour_shape_mismatch_1():
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(x, y, z)
-    except TypeError as exc:
-        assert exc.args[0] == 'Length of x must be number of columns in z.'
+    excinfo.match(r'Length of x must be number of columns in z.')
 
 
 def test_contour_shape_mismatch_2():
@@ -61,10 +60,9 @@ def test_contour_shape_mismatch_2():
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(x, y, z)
-    except TypeError as exc:
-        assert exc.args[0] == 'Length of y must be number of rows in z.'
+    excinfo.match(r'Length of y must be number of rows in z.')
 
 
 def test_contour_shape_mismatch_3():
@@ -77,15 +75,13 @@ def test_contour_shape_mismatch_3():
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(xg, y, z)
-    except TypeError as exc:
-        assert exc.args[0] == 'Number of dimensions of x and y should match.'
+    excinfo.match(r'Number of dimensions of x and y should match.')
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(x, yg, z)
-    except TypeError as exc:
-        assert exc.args[0] == 'Number of dimensions of x and y should match.'
+    excinfo.match(r'Number of dimensions of x and y should match.')
 
 
 def test_contour_shape_mismatch_4():
@@ -97,21 +93,15 @@ def test_contour_shape_mismatch_4():
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(b, g, z)
-    except TypeError as exc:
-        assert re.match(
-            r'Shape of x does not match that of z: ' +
-            r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
-            exc.args[0]) is not None, exc.args[0]
+    excinfo.match(r'Shape of x does not match that of z: found \(9L?, 9L?\) ' +
+                  r'instead of \(9L?, 10L?\)')
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(g, b, z)
-    except TypeError as exc:
-        assert re.match(
-            r'Shape of y does not match that of z: ' +
-            r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
-            exc.args[0]) is not None, exc.args[0]
+    excinfo.match(r'Shape of y does not match that of z: found \(9L?, 9L?\) ' +
+                  r'instead of \(9L?, 10L?\)')
 
 
 def test_contour_shape_invalid_1():
@@ -123,10 +113,9 @@ def test_contour_shape_invalid_1():
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(x, y, z)
-    except TypeError as exc:
-        assert exc.args[0] == 'Inputs x and y must be 1D or 2D.'
+    excinfo.match(r'Inputs x and y must be 1D or 2D.')
 
 
 def test_contour_shape_invalid_2():
@@ -138,10 +127,9 @@ def test_contour_shape_invalid_2():
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         ax.contour(x, y, z)
-    except TypeError as exc:
-        assert exc.args[0] == 'Input z must be a 2D array.'
+    excinfo.match(r'Input z must be a 2D array.')
 
 
 @image_comparison(baseline_images=['contour_manual_labels'])
@@ -313,49 +301,42 @@ def test_contourf_symmetric_locator():
 
 def test_contour_1x1_array():
     # github issue 8197
-    try:
+    with pytest.raises(TypeError) as excinfo:
         plt.contour([[0]])
-    except TypeError as exc:
-        assert exc.args[0] == 'Input z must be at least a 2x2 array.'
+    excinfo.match(r'Input z must be at least a 2x2 array.')
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         plt.contour([0], [0], [[0]])
-    except TypeError as exc:
-        assert exc.args[0] == 'Input z must be at least a 2x2 array.'
+    excinfo.match(r'Input z must be at least a 2x2 array.')
 
 
 def test_internal_cpp_api():
     # Following github issue 8197.
     import matplotlib._contour as _contour
 
-    try:
+    with pytest.raises(TypeError) as excinfo:
         qcg = _contour.QuadContourGenerator()
-    except TypeError as exc:
-        assert exc.args[0] == 'function takes exactly 6 arguments (0 given)'
+    excinfo.match(r'function takes exactly 6 arguments \(0 given\)')
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         qcg = _contour.QuadContourGenerator(1, 2, 3, 4, 5, 6)
-    except ValueError as exc:
-        assert exc.args[0] == 'Expected 2-dimensional array, got 0'
+    excinfo.match(r'Expected 2-dimensional array, got 0')
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         qcg = _contour.QuadContourGenerator([[0]], [[0]], [[]], None, True, 0)
-    except ValueError as exc:
-        assert exc.args[0] == 'x, y and z must all be 2D arrays with the same dimensions'
+    excinfo.match(r'x, y and z must all be 2D arrays with the same dimensions')
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         qcg = _contour.QuadContourGenerator([[0]], [[0]], [[0]], None, True, 0)
-    except ValueError as exc:
-        assert exc.args[0] == 'x, y and z must all be at least 2x2 arrays'
+    excinfo.match(r'x, y and z must all be at least 2x2 arrays')
 
     arr = [[0, 1], [2, 3]]
-    try:
+    with pytest.raises(ValueError) as excinfo:
         qcg = _contour.QuadContourGenerator(arr, arr, arr, [[0]], True, 0)
-    except ValueError as exc:
-        assert exc.args[0] == 'If mask is set it must be a 2D array with the same dimensions as x.'
+    excinfo.match(r'If mask is set it must be a 2D array with the same ' +
+                  r'dimensions as x.')
 
     qcg = _contour.QuadContourGenerator(arr, arr, arr, None, True, 0)
-    try:
+    with pytest.raises(ValueError) as excinfo:
         qcg.create_filled_contour(1, 0)
-    except ValueError as exc:
-        assert exc.args[0] == 'filled contour levels must be increasing'
+    excinfo.match(r'filled contour levels must be increasing')
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -1055,78 +1055,71 @@ def test_internal_cpp_api():
     import matplotlib._tri as _tri
 
     # C++ Triangulation.
-    try:
+    with pytest.raises(TypeError) as excinfo:
         triang = _tri.Triangulation()
-    except TypeError as exc:
-        assert exc.args[0] == 'function takes exactly 7 arguments (0 given)'
+    excinfo.match(r'function takes exactly 7 arguments \(0 given\)')
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         triang = _tri.Triangulation([], [1], [[]], None, None, None, False)
-    except ValueError as exc:
-        assert exc.args[0] == 'x and y must be 1D arrays of the same length'
+    excinfo.match(r'x and y must be 1D arrays of the same length')
 
     x = [0, 1, 1]
     y = [0, 0, 1]
-    try:
+    with pytest.raises(ValueError) as excinfo:
         triang = _tri.Triangulation(x, y, [[0, 1]], None, None, None, False)
-    except ValueError as exc:
-        assert exc.args[0] == 'triangles must be a 2D array of shape (?,3)'
+    excinfo.match(r'triangles must be a 2D array of shape \(\?,3\)')
 
-    try:
-        triang = _tri.Triangulation(x, y, [[0, 1, 2]], [0, 1], None, None, False)
-    except ValueError as exc:
-        assert exc.args[0] == 'mask must be a 1D array with the same length as the triangles array'
+    tris = [[0, 1, 2]]
+    with pytest.raises(ValueError) as excinfo:
+        triang = _tri.Triangulation(x, y, tris, [0, 1], None, None, False)
+    excinfo.match(r'mask must be a 1D array with the same length as the ' +
+                  r'triangles array')
 
-    try:
-        triang = _tri.Triangulation(x, y, [[0, 1, 2]], None, [[1]], None, False)
-    except ValueError as exc:
-        assert exc.args[0] == 'edges must be a 2D array with shape (?,2)'
+    with pytest.raises(ValueError) as excinfo:
+        triang = _tri.Triangulation(x, y, tris, None, [[1]], None, False)
+    excinfo.match(r'edges must be a 2D array with shape \(\?,2\)')
 
-    try:
-        triang = _tri.Triangulation(x, y, [[0, 1, 2]], None, None, [[-1]], False)
-    except ValueError as exc:
-        assert exc.args[0] == 'neighbors must be a 2D array with the same shape as the triangles array'
+    with pytest.raises(ValueError) as excinfo:
+        triang = _tri.Triangulation(x, y, tris, None, None, [[-1]], False)
+    excinfo.match(r'neighbors must be a 2D array with the same shape as the ' +
+                  r'triangles array')
 
-    triang = _tri.Triangulation(x, y, [[0, 1, 2]], None, None, None, False)
+    triang = _tri.Triangulation(x, y, tris, None, None, None, False)
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         triang.calculate_plane_coefficients([])
-    except ValueError as exc:
-        assert exc.args[0] == 'z array must have same length as triangulation x and y arrays'
+    excinfo.match(r'z array must have same length as triangulation x and y ' +
+                  r'arrays')
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         triang.set_mask([0, 1])
-    except ValueError as exc:
-        assert exc.args[0] == 'mask must be a 1D array with the same length as the triangles array'
+    excinfo.match(r'mask must be a 1D array with the same length as the ' +
+                  r'triangles array')
 
     # C++ TriContourGenerator.
-    try:
+    with pytest.raises(TypeError) as excinfo:
         tcg = _tri.TriContourGenerator()
-    except TypeError as exc:
-        assert exc.args[0] == 'function takes exactly 2 arguments (0 given)'
+    excinfo.match(r'function takes exactly 2 arguments \(0 given\)')
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         tcg = _tri.TriContourGenerator(triang, [1])
-    except ValueError as exc:
-        assert exc.args[0] == 'z must be a 1D array with the same length as the x and y arrays'
+    excinfo.match(r'z must be a 1D array with the same length as the x and ' +
+                  r'y arrays')
 
     z = [0, 1, 2]
     tcg = _tri.TriContourGenerator(triang, z)
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         tcg.create_filled_contour(1, 0)
-    except ValueError as exc:
-        assert exc.args[0] == 'filled contour levels must be increasing'
+    excinfo.match(r'filled contour levels must be increasing')
 
     # C++ TrapezoidMapTriFinder.
-    try:
+    with pytest.raises(TypeError) as excinfo:
         trifinder = _tri.TrapezoidMapTriFinder()
-    except TypeError as exc:
-        assert exc.args[0] == 'function takes exactly 1 argument (0 given)'
+    excinfo.match(r'function takes exactly 1 argument \(0 given\)')
 
     trifinder = _tri.TrapezoidMapTriFinder(triang)
 
-    try:
+    with pytest.raises(ValueError) as excinfo:
         trifinder.find_many([0], [0, 1])
-    except ValueError as exc:
-        assert exc.args[0] == 'x and y must be array_like with same shape'
+    excinfo.match(r'x and y must be array_like with same shape')
diff --git a/pytest.ini b/pytest.ini
@@ -50,13 +50,11 @@ pep8ignore =
     matplotlib/testing/jpl_units/UnitDbl.py E201 E202 E203
     matplotlib/testing/jpl_units/UnitDblConverter.py E201 E202 E203 E251 E302 E501 E711
     matplotlib/testing/jpl_units/UnitDblFormatter.py E201 E202 E251 E302
-    matplotlib/tests/test_contour.py E501
     matplotlib/tests/test_image.py E225 E231 E251 E302 E303 E501 E502
     matplotlib/tests/test_lines.py E231 E261
     matplotlib/tests/test_mathtext.py E261 E302 E501
     matplotlib/tests/test_rcparams.py E231 E501
     matplotlib/tests/test_tightlayout.py E302
-    matplotlib/tests/test_triangulation.py E501
     matplotlib/tri/triinterpolate.py E201 E221
     matplotlib/_cm.py E101 E202 E203 W191
     matplotlib/_mathtext_data.py E203 E231 E261 E501
