fix: Adjust discovery and creator usage

* Adjust `current_fastest` fixture to correctly use `key_to_class` for creator selection.
* Update `test_can_build_c_extensions` with a slow marker and xfail condition for CI.
* Modify `activation_python` fixture to pass the correct creator name.
* Introduce `MockCache` in `test_windows.py` for improved discovery tests.
* Update `propose_interpreters` function signature in `src/virtualenv/discovery/windows/__init__.py` to accept `cache`.
* Pass `cache` to `Pep514PythonInfo.from_exe`.

Signed-off-by: Emre Şafak <[email protected]>

Author: esafak

src/virtualenv/discovery/windows/__init__.py

@@ -16,7 +16,7 @@ class Pep514PythonInfo(PythonInfo):
     """A Python information acquired from PEP-514."""
 
 
-def propose_interpreters(spec, app_data, env):
+def propose_interpreters(spec, app_data, cache, env):
     # see if PEP-514 entries are good
 
     # start with higher python versions in an effort to use the latest version available
@@ -39,7 +39,7 @@ def propose_interpreters(spec, app_data, env):
             interpreter = Pep514PythonInfo.from_exe(
                 exe,
                 app_data,
-                app_data.cache,
+                cache,
                 raise_on_error=False,
                 env=env,
             )

tests/conftest.py

@@ -317,7 +317,7 @@ def current_creators(session_app_data):
 
 @pytest.fixture(scope="session")
 def current_fastest(current_creators):
-    return "builtin" if "builtin" in current_creators else next(iter(current_creators))
+    return "builtin" if "builtin" in current_creators.key_to_class else next(iter(current_creators.key_to_class))
 
 
 @pytest.fixture(scope="session")

tests/unit/activation/conftest.py

@@ -231,12 +231,11 @@ def raise_on_non_source_class():
 @pytest.fixture(scope="session", params=[True, False], ids=["with_prompt", "no_prompt"])
 def activation_python(request, tmp_path_factory, special_char_name, current_fastest, session_app_data):
     dest = os.path.join(str(tmp_path_factory.mktemp("activation-tester-env")), special_char_name)
-    creator_name = next(iter(current_fastest))
     cmd = [
         "--without-pip",
         dest,
         "--creator",
-        creator_name,
+        current_fastest,
         "-vv",
         "--no-periodic-update",
         "--app-data",

tests/unit/create/via_global_ref/test_build_c_ext.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import os
 import shutil
 import subprocess
 from pathlib import Path
@@ -16,6 +17,12 @@
 logger = logging.getLogger(__name__)
 
 
+@pytest.mark.slow
+@pytest.mark.xfail(
+    condition=bool(os.environ.get("CI_RUN")),
+    strict=False,
+    reason="did not manage to setup CI to run with VC 14.1 C++ compiler, but passes locally",
+)
 def test_can_build_c_extensions(tmp_path, coverage_env, session_app_data):
     cache = FileCache(session_app_data.py_info, session_app_data.py_info_clear)
     current = PythonInfo.current_system(session_app_data, cache)

tests/unit/discovery/windows/test_windows.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from tests.unit.discovery.util import MockAppData
+from tests.unit.discovery.util import MockAppData, MockCache
 from virtualenv.discovery.py_spec import PythonSpec
 
 
@@ -37,5 +37,5 @@ def test_propose_interpreters(string_spec, expected_exe):
     from virtualenv.discovery.windows import propose_interpreters  # noqa: PLC0415
 
     spec = PythonSpec.from_string_spec(string_spec)
-    interpreter = next(propose_interpreters(spec, MockAppData(), env=None))
+    interpreter = next(propose_interpreters(spec, MockAppData(), MockCache(), env=None))
     assert interpreter.executable == expected_exe