fixup! feat(config): Allow ranges in envlist

Author: mimre25

tests/config/loader/ini/test_factor.py

@@ -181,12 +181,20 @@ def test_factor_config_no_env_list_creates_env(tox_ini_conf: ToxIniCreator) -> N
 @pytest.mark.parametrize(
     ("env_list", "expected_envs"),
     [
-        ("py3{10-13}", ["py310", "py311", "py312", "py313"]),
-        ("py3{10-11},a", ["py310", "py311", "a"]),
-        ("py3{10-11},a{1-2}", ["py310", "py311", "a1", "a2"]),
-        ("py3{10-12,14}", ["py310", "py311", "py312", "py314"]),
-        ("py3{8-10,12,14-16}", ["py38", "py39", "py310", "py312", "py314", "py315", "py316"]),
-        (
+        pytest.param("py3{10-13}", ["py310", "py311", "py312", "py313"], id="Expand positive range"),
+        pytest.param("py3{10-11},a", ["py310", "py311", "a"], id="Expand range and add additional env"),
+        pytest.param("py3{10-11},a{1-2}", ["py310", "py311", "a1", "a2"], id="Expand multiple env with ranges"),
+        pytest.param(
+            "py3{10-12,14}",
+            ["py310", "py311", "py312", "py314"],
+            id="Expand ranges, and allow extra parameter in generator",
+        ),
+        pytest.param(
+            "py3{8-10,12,14-16}",
+            ["py38", "py39", "py310", "py312", "py314", "py315", "py316"],
+            id="Expand multiple ranges for one generator",
+        ),
+        pytest.param(
             "py3{10-11}-django1.{3-5}",
             [
                 "py310-django1.3",
@@ -196,8 +204,9 @@ def test_factor_config_no_env_list_creates_env(tox_ini_conf: ToxIniCreator) -> N
                 "py311-django1.4",
                 "py311-django1.5",
             ],
+            id="Expand ranges and factor multiple environment parts",
         ),
-        (
+        pytest.param(
             "py3{10-11, 13}-django1.{3-4, 6}",
             [
                 "py310-django1.3",
@@ -210,16 +219,22 @@ def test_factor_config_no_env_list_creates_env(tox_ini_conf: ToxIniCreator) -> N
                 "py313-django1.4",
                 "py313-django1.6",
             ],
+            id="Expand ranges and parameters and factor multiple environment parts",
+        ),
+        pytest.param(
+            "py3{10-11},a{1-2}-b{3-4}",
+            ["py310", "py311", "a1-b3", "a1-b4", "a2-b3", "a2-b4"],
+            id="Expand ranges and parameters & factor multiple environment parts for multiple generative environments",
         ),
-        ("py3{10-11},a{1-2}-b{3-4}", ["py310", "py311", "a1-b3", "a1-b4", "a2-b3", "a2-b4"]),
-        ("py3{13-11}", ["py313", "py312", "py311"]),
-        ("py3{-11}", ["py3-11"]),
-        ("foo{11-}", ["foo11-"]),
-        ("foo{a-}", ["fooa-"]),
-        ("foo{-a}", ["foo-a"]),
-        ("foo{a-11}", ["fooa-11"]),
-        ("foo{13-a}", ["foo13-a"]),
-        ("foo{a-b}", ["fooa-b"]),
+        pytest.param("py3{13-11}", ["py313", "py312", "py311"], id="Expand negative ranges"),
+        pytest.param("3.{10-13}", ["3.10", "3.11", "3.12", "3.13"], id="Expand new-style python envs"),
+        pytest.param("py3{-11}", ["py3-11"], id="Don't expand left-open numerical range"),
+        pytest.param("foo{11-}", ["foo11-"], id="Don't expand right-open numerical range"),
+        pytest.param("foo{a-}", ["fooa-"], id="Don't expand right-open range"),
+        pytest.param("foo{-a}", ["foo-a"], id="Don't expand left-open range"),
+        pytest.param("foo{a-11}", ["fooa-11"], id="Don't expand alpha-umerical range"),
+        pytest.param("foo{13-a}", ["foo13-a"], id="Don't expand numerical-alpha range"),
+        pytest.param("foo{a-b}", ["fooa-b"], id="Don't expand non-numerical range"),
     ],
 )
 def test_env_list_expands_ranges(env_list: str, expected_envs: list[str], tox_ini_conf: ToxIniCreator) -> None: