Merge pull request #20829 from tacaswell/tst_simplify_warning_catching

jklymak · web-flow · commit c139b3d69082 · 2021-08-12T16:34:09.000-07:00
TST: neither warned and pytest upstream deprecated this usage
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -180,8 +180,8 @@ def test_save_animation_smoketest(tmpdir, writer, frame_format, output, anim):
     with tmpdir.as_cwd():
         anim.save(output, fps=30, writer=writer, bitrate=500, dpi=dpi,
                   codec=codec)
-    with pytest.warns(None):
-        del anim
+
+    del anim
 
 
 @pytest.mark.parametrize('writer', [
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -437,6 +437,5 @@ def test_mathtext_cmr10_minus_sign():
     mpl.rcParams['axes.formatter.use_mathtext'] = True
     fig, ax = plt.subplots()
     ax.plot(range(-1, 1), range(-1, 1))
-    with pytest.warns(None) as record:
-        fig.canvas.draw()
-    assert len(record) == 0, "\n".join(str(e.message) for e in record)
+    # draw to make sure we have no warnings
+    fig.canvas.draw()
