Consolidate tests

scottshambaugh · scottshambaugh · commit f94424372685 · 2026-03-10T12:08:16.000-06:00
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -300,6 +300,9 @@ def generate_validator_testcases(valid):
                    ValueError),
                   ("cycler('c', [j.__class__(j).lower() for j in ['r', 'b']])",
                    ValueError),
+                  # list comprehensions are arbitrary code, even if "safe"
+                  ("cycler('color', [x for x in ['r', 'g', 'b']])",
+                   ValueError),
                   ('1 + 2', ValueError),  # doesn't produce a Cycler object
                   ('os.system("echo Gotcha")', ValueError),  # os not available
                   ('import os', ValueError),  # should not be able to import
@@ -466,14 +469,6 @@ def test_validate_cycler_bad_color_string():
         validate_cycler("cycler('color', 'foo')")
 
 
-def test_validate_cycler_no_code_execution():
-    # List comprehensions are arbitrary code. The old eval()-based parser
-    # would execute this successfully, but the AST-based parser rejects it
-    # because only literal values are allowed in cycler arguments.
-    with pytest.raises(ValueError):
-        validate_cycler("cycler('color', [x for x in ['r', 'g', 'b']])")
-
-
 @pytest.mark.parametrize('weight, parsed_weight', [
     ('bold', 'bold'),
     ('BOLD', ValueError),  # weight is case-sensitive
