Merge pull request #16760 from meeseeksmachine/auto-backport-of-pr-16735-on-v3.2.x

QuLogic · web-flow · commit 9da2546b62ca · 2020-03-13T16:41:38.000-04:00
Backport PR #16735 on branch v3.2.x (Make test_stem less flaky.)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3227,10 +3227,15 @@ def test_hist_stacked_weighted():
     ax.hist((d1, d2), weights=(w1, w2), histtype="stepfilled", stacked=True)
 
 
-@pytest.mark.parametrize("use_line_collection", [True, False],
-                         ids=['w/ line collection', 'w/o line collection'])
-@image_comparison(['stem.png'], style='mpl20', remove_text=True)
-def test_stem(use_line_collection):
+@image_comparison(['stem.png', 'stem.png'], style='mpl20', remove_text=True)
+def test_stem():
+    # Note, we don't use @pytest.mark.parametrize, because in parallel this
+    # might cause one process result to overwrite another's.
+    for use_line_collection in [True, False]:
+        _test_stem(use_line_collection)
+
+
+def _test_stem(use_line_collection):
     x = np.linspace(0.1, 2 * np.pi, 100)
     args = (x, np.cos(x))
     # Label is a single space to force a legend to be drawn, but to avoid any
