TST Added a test to check valid and invalid markers (#2)

lkilcher · web-flow · commit 91191ce5105b · 2017-01-29T10:44:22.000-07:00
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -253,7 +253,8 @@ def set_marker(self, marker):
         elif (iterable(marker) and len(marker) in (2, 3) and
                 marker[1] in (0, 1, 2, 3)):
             self._marker_function = self._set_tuple_marker
-        elif not isinstance(marker, list) and marker in self.markers:
+        elif (not isinstance(marker, (np.ndarray, list)) and
+              marker in self.markers):
             self._marker_function = getattr(
                 self, '_set_' + self.markers[marker])
         elif is_string_like(marker) and is_math_text(marker):
diff --git a/lib/matplotlib/tests/test_marker.py b/lib/matplotlib/tests/test_marker.py
@@ -0,0 +1,20 @@
+import numpy as np
+from matplotlib import markers
+
+import pytest
+
+
+def test_markers_valid():
+    marker_style = markers.MarkerStyle()
+    mrk_array = np.array([[-0.5, 0],
+                          [0.5, 0]])
+    # Checking this doesn't fail.
+    marker_style.set_marker(mrk_array)
+
+
+def test_markers_invalid():
+    marker_style = markers.MarkerStyle()
+    mrk_array = np.array([[-0.5, 0,  1, 2, 3]])
+    # Checking this doesn't fail.
+    with pytest.raises(ValueError):
+        marker_style.set_marker(mrk_array)
