francois
4d8cafb5a0
eval_proc was started before -d/GUI defines reached gd, so ``-d python_bin=...`` and the GUI ``python_bin`` preference were silently ignored by the very subprocess that runs ``<| ... |>`` evals (and only took effect for later items once the discovery cache had already been seeded with the system interpreter). apply_overrides() is now applied before eval_process_init(), and bins._resolve()'s cache is keyed by (name, override) so a later param.yaml change re-resolves on the next lookup. The validation suite now ships a wrapper (run.sh / run.bat) that creates a dedicated venv in the system temp dir and pins it via ``-d python_bin=...``. A new ``venv`` item asserts the override took effect for both eval_proc and py_func paths, with a ``sys.prefix != sys.base_prefix`` marker to catch the case where the override happens to be a system interpreter (path-equality alone would miss it, the venv's ``bin/python3`` being a symlink to the host). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
54 lines
1.9 KiB
Plaintext
54 lines
1.9 KiB
Plaintext
# venv test: assert that the dedicated validation venv is the python
|
|
# being used for every test-execution subprocess (eval_proc / py_func /
|
|
# cycle / ...). The venv path is pinned by ``-d python_bin=...`` in
|
|
# test/validation/run.sh (or run.bat).
|
|
#
|
|
# We use ``abspath``/``normpath`` rather than ``realpath`` on purpose:
|
|
# the venv's ``bin/python3`` is a symlink to the host python, so
|
|
# realpath would map every venv interpreter to the same system path and
|
|
# the comparison would silently pass even *without* a venv.
|
|
# ``sys.prefix != sys.base_prefix`` is the venv-specific marker that
|
|
# catches that case.
|
|
|
|
- check:
|
|
name: python_bin is set in the global dict
|
|
key: $(test)_PASS
|
|
values:
|
|
- <| bool(r"$(python_bin)") |>
|
|
|
|
- check:
|
|
name: eval_proc subprocess runs in the validation venv
|
|
key: $(test)_PASS
|
|
values:
|
|
- <| os.path.normpath(os.path.abspath(sys.executable)) == os.path.normpath(os.path.abspath(r"$(python_bin)")) |>
|
|
|
|
- check:
|
|
name: eval_proc sys.prefix matches python_bin venv root
|
|
key: $(test)_PASS
|
|
values:
|
|
- <| os.path.normpath(os.path.abspath(sys.prefix)) == os.path.dirname(os.path.dirname(os.path.normpath(os.path.abspath(r"$(python_bin)")))) |>
|
|
|
|
- check:
|
|
name: eval_proc is actually inside a venv (sys.prefix != sys.base_prefix)
|
|
key: $(test)_PASS
|
|
values:
|
|
- <| os.path.normpath(os.path.abspath(sys.prefix)) != os.path.normpath(os.path.abspath(sys.base_prefix)) |>
|
|
|
|
- py_func:
|
|
name: py_func subprocess runs in the validation venv
|
|
key: $(test)_PASS
|
|
file: $(test_path)$(psep)verify_venv.py
|
|
func_name: check_sys_executable
|
|
|
|
- py_func:
|
|
name: py_func sys.prefix matches python_bin venv root
|
|
key: $(test)_PASS
|
|
file: $(test_path)$(psep)verify_venv.py
|
|
func_name: check_sys_prefix_in_venv
|
|
|
|
- py_func:
|
|
name: py_func is actually inside a venv
|
|
key: $(test)_PASS
|
|
file: $(test_path)$(psep)verify_venv.py
|
|
func_name: check_is_venv
|