Adapt drawstyles test.

anntzer · anntzer · commit e7dd0e3e9176 · 2016-06-29T00:20:35.000-07:00
Remove duplicated test as well.
diff --git a/lib/matplotlib/tests/baseline_images/test_lines/drawstyle_variants.png b/lib/matplotlib/tests/baseline_images/test_lines/drawstyle_variants.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4460,12 +4460,6 @@ def test_ls_ds_conflict():
                   linestyle='steps-pre:', drawstyle='steps-post')
 
 
-@cleanup
-def test_ls_ds_conflict():
-    assert_raises(ValueError, plt.plot, range(32),
-                  linestyle='steps-pre:', drawstyle='steps-post')
-
-
 @image_comparison(baseline_images=['date_timezone_x'], extensions=['png'])
 def test_date_timezone_x():
     # Tests issue 5575
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -118,16 +118,18 @@ def test_valid_linestyles():
         line.set_linestyle('aardvark')
 
 
-@cleanup
+@image_comparison(baseline_images=['drawstyle_variants'], remove_text=True,
+                  extensions=["png"])
 def test_drawstyle_variants():
-    fig = plt.figure()
-    ax = fig.add_subplot(1, 1, 1)
-    for ds in ("default", "steps-mid", "steps-pre", "steps-post",
-               "steps", None):
-        ax.plot(range(10), drawstyle=ds)
-
-    fig.canvas.draw()
-    assert True
+    fig, axs = plt.subplots(6)
+    dss = ["default", "steps-mid", "steps-pre", "steps-post", "steps", None]
+    # We want to check that drawstyles are properly handled even for very long
+    # lines (for which the subslice optimization is on); however, we need
+    # to zoom in so that the difference between the drawstyles is actually
+    # visible.
+    for ax, ds in zip(axs.flat, dss):
+        ax.plot(range(2000), drawstyle=ds)
+        ax.set(xlim=(0, 2), ylim=(0, 2))
 
 
 @cleanup
