Merge pull request #11977 from meeseeksmachine/auto-backport-of-pr-11973-on-v2.2.x

tacaswell · web-flow · commit fd4e79c0df33 · 2018-08-29T20:40:33.000-04:00
Backport PR #11973 on branch v2.2.x
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2913,24 +2913,21 @@ def test_hist_stacked_step():
     ax.hist((d1, d2), histtype="step", stacked=True)
 
 
-@image_comparison(baseline_images=['hist_stacked_normed'])
-def test_hist_stacked_normed():
-    # make some data
-    d1 = np.linspace(1, 3, 20)
-    d2 = np.linspace(0, 10, 50)
-    fig, ax = plt.subplots()
-    with pytest.warns(UserWarning):
-        ax.hist((d1, d2), stacked=True, normed=True)
-
-
-@image_comparison(baseline_images=['hist_stacked_normed'], extensions=['png'])
+@image_comparison(baseline_images=['hist_stacked_normed',
+                                   'hist_stacked_normed'])
 def test_hist_stacked_density():
     # make some data
     d1 = np.linspace(1, 3, 20)
     d2 = np.linspace(0, 10, 50)
+
     fig, ax = plt.subplots()
     ax.hist((d1, d2), stacked=True, density=True)
 
+    # Also check that the old keyword works.
+    fig, ax = plt.subplots()
+    with pytest.warns(UserWarning):
+        ax.hist((d1, d2), stacked=True, normed=True)
+
 
 @pytest.mark.parametrize('normed', [False, True])
 @pytest.mark.parametrize('density', [False, True])
