Better selection support (#2290)

5 files changed, 36 insertions, 22 deletions

diff --git a/tests/config/cli/test_cli_env_var.py b/tests/config/cli/test_cli_env_var.py
index c69ce238..4106e104 100644
--- a/tests/config/cli/test_cli_env_var.py
+++ b/tests/config/cli/test_cli_env_var.py
@@ -7,7 +7,7 @@ import pytest
 from tox.config.cli.parse import get_options
 from tox.config.loader.api import Override
 from tox.pytest import CaptureFixture, LogCaptureFixture, MonkeyPatch
-from tox.session.common import CliEnv
+from tox.session.env_select import CliEnv
 from tox.session.state import State
 
 
@@ -59,6 +59,8 @@ def test_verbose_no_test() -> None:
         "parallel_no_spinner": False,
         "pre": False,
         "index_url": [],
+        "factors": [],
+        "labels": [],
     }
 
 
@@ -77,8 +79,8 @@ def test_env_var_exhaustive_parallel_values(
     monkeypatch.setenv("TOX_PARALLEL_LIVE", "no")
     monkeypatch.setenv("TOX_OVERRIDE", "a=b\nc=d")
 
-    parsed, handlers, _, __, ___ = get_options()
-    assert vars(parsed) == {
+    options = get_options()
+    assert vars(options.parsed) == {
         "always_copy": False,
         "colored": "no",
         "command": "legacy",
@@ -114,9 +116,11 @@ def test_env_var_exhaustive_parallel_values(
         "work_dir": None,
         "root_dir": None,
         "config_file": None,
+        "factors": [],
+        "labels": [],
     }
-    assert parsed.verbosity == 4
-    assert handlers == core_handlers
+    assert options.parsed.verbosity == 4
+    assert options.cmd_handlers == core_handlers
 
 
 def test_ini_help(monkeypatch: MonkeyPatch, capsys: CaptureFixture) -> None:
diff --git a/tests/config/cli/test_cli_ini.py b/tests/config/cli/test_cli_ini.py
index 0d72d249..f97927d4 100644
--- a/tests/config/cli/test_cli_ini.py
+++ b/tests/config/cli/test_cli_ini.py
@@ -12,7 +12,7 @@ from pytest_mock import MockerFixture
 from tox.config.cli.parse import get_options
 from tox.config.loader.api import Override
 from tox.pytest import CaptureFixture, LogCaptureFixture, MonkeyPatch
-from tox.session.common import CliEnv
+from tox.session.env_select import CliEnv
 from tox.session.state import State
 
 
@@ -56,14 +56,14 @@ def test_ini_empty(
     monkeypatch.setenv("TOX_CONFIG_FILE", str(to))
     to.write_text(content)
     mocker.patch("tox.config.cli.parse.discover_source", return_value=mocker.MagicMock(path=Path()))
-    parsed, handlers, _, __, ___ = get_options("r")
-    assert vars(parsed) == default_options
-    assert parsed.verbosity == 2
-    assert handlers == core_handlers
+    options = get_options("r")
+    assert vars(options.parsed) == default_options
+    assert options.parsed.verbosity == 2
+    assert options.cmd_handlers == core_handlers
 
     to.unlink()
-    missing_parsed, ____, _, __, ___ = get_options("r")
-    assert vars(missing_parsed) == vars(parsed)
+    missing_options = get_options("r")
+    assert vars(missing_options.parsed) == vars(options.parsed)
 
 
 @pytest.fixture()
@@ -92,12 +92,14 @@ def default_options(tmp_path: Path) -> dict[str, Any]:
         "work_dir": None,
         "root_dir": None,
         "config_file": (tmp_path / "tox.ini").absolute(),
+        "factors": [],
+        "labels": [],
     }
 
 
 def test_ini_exhaustive_parallel_values(exhaustive_ini: Path, core_handlers: dict[str, Callable[[State], int]]) -> None:
-    parsed, handlers, _, __, ___ = get_options("p")
-    assert vars(parsed) == {
+    options = get_options("p")
+    assert vars(options.parsed) == {
         "colored": "yes",
         "command": "p",
         "default_runner": "virtualenv",
@@ -124,9 +126,11 @@ def test_ini_exhaustive_parallel_values(exhaustive_ini: Path, core_handlers: dic
         "work_dir": None,
         "root_dir": None,
         "config_file": exhaustive_ini,
+        "factors": [],
+        "labels": [],
     }
-    assert parsed.verbosity == 4
-    assert handlers == core_handlers
+    assert options.parsed.verbosity == 4
+    assert options.cmd_handlers == core_handlers
 
 
 def test_ini_help(exhaustive_ini: Path, capsys: CaptureFixture) -> None:
@@ -148,7 +152,7 @@ def test_bad_cli_ini(
     mocker.patch("tox.config.cli.parse.discover_source", return_value=mocker.MagicMock(path=Path()))
     caplog.set_level(logging.WARNING)
     monkeypatch.setenv("TOX_CONFIG_FILE", str(tmp_path))
-    parsed, _, __, ___, ____ = get_options("r")
+    options = get_options("r")
     msg = (
         "PermissionError(13, 'Permission denied')"
         if sys.platform == "win32"
@@ -156,7 +160,7 @@ def test_bad_cli_ini(
     )
     assert caplog.messages == [f"failed to read config file {tmp_path} because {msg}"]
     default_options["config_file"] = tmp_path
-    assert vars(parsed) == default_options
+    assert vars(options.parsed) == default_options
 
 
 def test_bad_option_cli_ini(
diff --git a/tests/config/loader/ini/replace/conftest.py b/tests/config/loader/ini/replace/conftest.py
index 1ef6d3cf..6025f839 100644
--- a/tests/config/loader/ini/replace/conftest.py
+++ b/tests/config/loader/ini/replace/conftest.py
@@ -27,8 +27,14 @@ def replace_one(tmp_path: Path) -> ReplaceOne:
         tox_ini_file = tmp_path / "tox.ini"
         tox_ini_file.write_text(f"[testenv:py]\nenv={conf}\n")
         tox_ini = ToxIni(tox_ini_file)
-        config = Config(tox_ini, options=Parsed(override=[]), root=tmp_path, pos_args=pos_args, work_dir=tmp_path)
-        config.register_config_set = lambda name, env_config_set: None  # type: ignore[assignment] # noqa: U100
+
+        config = Config(
+            tox_ini,
+            options=Parsed(override=[]),
+            root=tmp_path,
+            pos_args=pos_args,
+            work_dir=tmp_path,
+        )
         loader = config.get_env("py").loaders[0]
         args = ConfigLoadArgs(chain=[], name="a", env_name="a")
         return loader.load(key="env", of_type=str, conf=config, factory=None, args=args)
diff --git a/tests/config/source/test_discover.py b/tests/config/source/test_discover.py
index 3ed16ba0..1ef7073d 100644
--- a/tests/config/source/test_discover.py
+++ b/tests/config/source/test_discover.py
@@ -8,7 +8,7 @@ from tox.pytest import ToxProjectCreator
 def out_no_src(path: Path) -> str:
     return (
         f"ROOT: No tox.ini or setup.cfg or pyproject.toml found, assuming empty tox.ini at {path}\n"
-        f"additional environments:\npy -> [no description]\n"
+        f"default environments:\npy -> [no description]\n"
     )
 
 
diff --git a/tests/config/test_sets.py b/tests/config/test_sets.py
index 8e72b636..ca577875 100644
--- a/tests/config/test_sets.py
+++ b/tests/config/test_sets.py
@@ -158,7 +158,7 @@ def test_define_custom_set(tox_project: ToxProjectCreator) -> None:
     exp = "MagicConfigSet(loaders=[IniLoader(section=magic, overrides={}), " "IniLoader(section=A, overrides={})])"
     assert repr(conf) == exp
 
-    assert isinstance(result.state.conf.options, Parsed)
+    assert isinstance(result.state.conf._options, Parsed)
 
 
 def test_do_not_allow_create_config_set(mocker: MockerFixture) -> None: