liuhao1024
ad8f995bcf
Under an SSH remote backend the web server is launched by running the uv BASE interpreter with the venv's site-packages injected into sys.path at startup, so sys.executable is a dependency-less python. Detached dashboard actions spawned from it (Update now, restart, anything routed through _spawn_hermes_action) inherited neither the injected path nor a PYTHONPATH and died on the first third-party import — 'Update now' always failed instantly with ModuleNotFoundError: No module named 'yaml' while 'hermes update' from the venv worked (#90026). _dashboard_spawn_executable now prefers the install's own venv interpreter (venv/bin/python, venv/Scripts/python.exe) when it differs from sys.executable, resolving the same dependency set the venv launcher provides. Same-interpreter launches return sys.executable unchanged, preserving the Windows console-ownership behavior verbatim, and layouts without an install venv keep the old fallback.
70 lines
2.9 KiB
Python
70 lines
2.9 KiB
Python
"""Tests for the detached-dashboard-action interpreter choice (#90026).
|
|
|
|
Under an SSH remote backend the web server runs on the **uv base
|
|
interpreter** with the venv's site-packages injected into ``sys.path`` at
|
|
startup. A detached action spawned from ``sys.executable`` (the base
|
|
interpreter) inherits no injected path and no PYTHONPATH, so it dies on the
|
|
first third-party import. The spawner must prefer the install's own venv
|
|
interpreter when it differs from ``sys.executable``.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
from pathlib import Path
|
|
from unittest.mock import patch
|
|
|
|
import hermes_cli.web_server as web_server
|
|
|
|
|
|
class TestDashboardSpawnExecutable:
|
|
def test_same_interpreter_returns_sys_executable(self, tmp_path):
|
|
"""When sys.executable IS the venv python (normal launch), the
|
|
behavior is unchanged — same path back, verbatim."""
|
|
fake_venv = tmp_path / "venv" / "bin" / "python"
|
|
fake_venv.parent.mkdir(parents=True)
|
|
fake_venv.touch()
|
|
with (
|
|
patch.object(web_server, "PROJECT_ROOT", tmp_path),
|
|
patch.object(sys, "executable", str(fake_venv)),
|
|
):
|
|
assert web_server._dashboard_spawn_executable() == str(fake_venv)
|
|
|
|
def test_base_interpreter_replaced_by_venv_python(self, tmp_path):
|
|
"""sys.executable pointing at the dependency-less uv base
|
|
interpreter (SSH remote backend) resolves to the install's venv
|
|
python instead (#90026)."""
|
|
fake_venv = tmp_path / "venv" / "bin" / "python"
|
|
fake_venv.parent.mkdir(parents=True)
|
|
fake_venv.touch()
|
|
base_interp = tmp_path / "uv-base" / "python"
|
|
with (
|
|
patch.object(web_server, "PROJECT_ROOT", tmp_path),
|
|
patch.object(sys, "executable", str(base_interp)),
|
|
):
|
|
chosen = web_server._dashboard_spawn_executable()
|
|
assert chosen == str(fake_venv)
|
|
|
|
def test_windows_layout_resolved(self, tmp_path):
|
|
"""The Windows venv layout (Scripts/python.exe) is honored."""
|
|
fake_venv = tmp_path / "venv" / "Scripts" / "python.exe"
|
|
fake_venv.parent.mkdir(parents=True)
|
|
fake_venv.touch()
|
|
base_interp = tmp_path / "uv-base" / "python.exe"
|
|
with (
|
|
patch.object(web_server, "PROJECT_ROOT", tmp_path),
|
|
patch.object(sys, "executable", str(base_interp)),
|
|
):
|
|
chosen = web_server._dashboard_spawn_executable()
|
|
assert Path(chosen).name == "python.exe"
|
|
assert "Scripts" in chosen
|
|
|
|
def test_no_venv_falls_back_to_sys_executable(self, tmp_path):
|
|
"""Exotic layouts without an install venv keep the old behavior."""
|
|
base_interp = tmp_path / "uv-base" / "python"
|
|
with (
|
|
patch.object(web_server, "PROJECT_ROOT", tmp_path),
|
|
patch.object(sys, "executable", str(base_interp)),
|
|
):
|
|
assert web_server._dashboard_spawn_executable() == str(base_interp)
|