Merge pull request #12689 from meeseeksmachine/auto-backport-of-pr-12683-on-v3.0.x

QuLogic · web-flow · commit ab3812d03d80 · 2018-10-31T23:36:27.000-04:00
Backport PR #12683 on branch v3.0.x (TST: mark test_constrainedlayout.py::test_colorbar_location as flaky)
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -380,6 +380,11 @@ def test_constrained_layout23():
         fig.suptitle("Suptitle{}".format(i))
 
 
+# This test occasionally fails the image comparison tests, so we mark as
+# flaky.  Apparently the constraint solver occasionally doesn't fully
+# optimize.  Would be nice if this were more deterministic...
+@pytest.mark.timeout(30)
+@pytest.mark.flaky(reruns=3)
 @image_comparison(baseline_images=['test_colorbar_location'],
         extensions=['png'], remove_text=True, style='mpl20')
 def test_colorbar_location():
