From d0deb47c4828467fa76ccc421ddb17e5653bdf2b Mon Sep 17 00:00:00 2001
From: Jody Klymak <jklymak@gmail.com>
Date: Wed, 31 Oct 2018 16:33:48 -0700
Subject: [PATCH] TST: mark test_constrainedlayout.py::test_colorbar_location
 as flaky (#12683)

---
 lib/matplotlib/tests/test_constrainedlayout.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
index e282cb6ad80d..de8161ea70fa 100644
--- 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():