Increased test coverage of markevery validator

salindersidhu · salindersidhu · commit c4d4f11e2152 · 2018-03-08T14:29:35.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -568,6 +568,8 @@ def validate_markevery(s):
                 raise ValueError("'markevery' tuple with first element of "
                                  "type float must have all elements of type "
                                  "float")
+            if not instance(tupType, (float, int)):
+                raise TypeError("'markevery' tuple is of an invalid type")
         if isinstance(s, list):
             if not all(isinstance(e, int) for e in s):
                 raise ValueError("'markevery' list must have all elements "
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -332,22 +332,28 @@ def generate_validator_testcases(valid):
           'success': ((None, None),
                       (1, 1),
                       (0.1, 0.1),
-                      ((1,1), (1,1)),
-                      ((0.1,0.1), (0.1,0.1)),
-                      ([1,2,3], [1,2,3]),
-                      (slice(2), slice(None,2,None)),
-                      (slice(1,2,3), slice(1,2,3))
+                      ((1, 1), (1, 1)),
+                      ((0.1, 0.1), (0.1, 0.1)),
+                      ([1, 2, 3], [1, 2, 3]),
+                      (slice(2), slice(None, 2, None)),
+                      (slice(1, 2, 3), slice(1, 2, 3))
                       ),
-          'fail': (((1,2,3), ValueError),
-                   ((0.1,0.2,0.3), ValueError),
-                   ((0.1,2,3), ValueError),
-                   ((1,0.2,0.3), ValueError),
-                   ((1,0.1), ValueError),
-                   ((0.1,1), ValueError),
+          'fail': (((1, 2, 3), ValueError),
+                   ([1, 2, 0.3], ValueError),
+                   (['a', 2, 3], ValueError),
+                   ([1, 2, 'a'], ValueError),
+                   ((0.1, 0.2, 0.3), ValueError),
+                   ((0.1, 2, 3), ValueError),
+                   ((1, 0.2, 0.3), ValueError),
+                   ((1, 0.1), ValueError),
+                   ((0.1, 1), ValueError),
                    (('abc'), ValueError),
-                   (('a'), ValueError),
-                   ('abc', ValueError),
-                   ('a', ValueError)
+                   ((1, 'a'), ValueError),
+                   ((0.1, 'b'), ValueError),
+                   (('a', 1), ValueError),
+                   (('a', 0.1), ValueError),
+                   ('abc', TypeError),
+                   ('a', TypeError)
                    )
          }
     )
