Merge pull request #7765 from dstansby/figure-test-clean

NelleV · web-flow · commit 3f7dad4edab9 · 2017-01-11T12:53:28.000-08:00
TST: Clean up figure tests
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -10,6 +10,7 @@
 from matplotlib.axes import Axes
 import matplotlib.pyplot as plt
 import numpy as np
+import warnings
 
 
 @cleanup
@@ -83,7 +84,11 @@ def test_gca():
 
     # the final request for a polar axes will end up creating one
     # with a spec of 111.
-    assert_true(fig.gca(polar=True) is not ax3)
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter('always')
+        # Changing the projection will throw a warning
+        assert_true(fig.gca(polar=True) is not ax3)
+        assert len(w) == 1
     assert_true(fig.gca(polar=True) is not ax2)
     assert_equal(fig.gca().get_geometry(), (1, 1, 1))
 
@@ -133,15 +138,14 @@ def test_alpha():
 
 @cleanup
 def test_too_many_figures():
-    import warnings
-
     with warnings.catch_warnings(record=True) as w:
         warnings.simplefilter("always")
         for i in range(rcParams['figure.max_open_warning'] + 1):
             fig = plt.figure()
         assert len(w) == 1
 
 
+@cleanup
 def test_iterability_axes_argument():
 
     # This is a regression test for matplotlib/matplotlib#3196. If one of the
