Revert test changes to reduce flakiness (before lock).

QuLogic · QuLogic · commit e00b63092f98 · 2020-05-04T15:34:57.000-04:00
These should no longer be needed with the lock, and are hopefully a bit clearer again. This reverts commit 95aa968, "Make test_imagegrid_cbar_mode_edge less flaky." This reverts commit 2e20058, "Make test_stem less flaky."
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3150,15 +3150,10 @@ def test_hist_stacked_weighted():
     ax.hist((d1, d2), weights=(w1, w2), histtype="stepfilled", stacked=True)
 
 
-@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):
+@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):
     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
diff --git a/lib/mpl_toolkits/tests/test_axes_grid.py b/lib/mpl_toolkits/tests/test_axes_grid.py
@@ -12,16 +12,10 @@
 # The original version of this test relied on mpl_toolkits's slightly different
 # colorbar implementation; moving to matplotlib's own colorbar implementation
 # caused the small image comparison error.
-@image_comparison(['imagegrid_cbar_mode.png', 'imagegrid_cbar_mode.png'],
+@pytest.mark.parametrize("legacy_colorbar", [False, True])
+@image_comparison(['imagegrid_cbar_mode.png'],
                   remove_text=True, style='mpl20', tol=0.3)
-def test_imagegrid_cbar_mode_edge():
-    # Note, we don't use @pytest.mark.parametrize, because in parallel this
-    # might cause one process result to overwrite another's.
-    for legacy_colorbar in [False, True]:
-        _test_imagegrid_cbar_mode_edge(legacy_colorbar)
-
-
-def _test_imagegrid_cbar_mode_edge(legacy_colorbar):
+def test_imagegrid_cbar_mode_edge(legacy_colorbar):
     mpl.rcParams["mpl_toolkits.legacy_colorbar"] = legacy_colorbar
 
     X, Y = np.meshgrid(np.linspace(0, 6, 30), np.linspace(0, 6, 30))
