hermes-admin/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

fix(tests): derive the quarantine guard tests' venv root from the checkout

Browse Source 
The Windows quarantine guards now resolve project_venv_dir(PROJECT_ROOT)
at call time, so the three tests that hard-coded PROJECT_ROOT/venv as the
venv-side interpreter went red on any host whose checkout uses .venv
(CI included: test_venv_launcher_ancestors_returns_venv_side_parent and
test_pause_kill_set_covers_venv_guard_abort_set). Mirror the guards'
lookup (and their resolved-path prefix match) in one helper instead.
This commit is contained in:
teknium1
2026-09-16 12:49:28 -07:00
committed by Teknium
parent 5baca08cc2
commit 92558efe45
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/hermes_cli/test_update_concurrent_quarantine.py
View File

@@ -18,6 +18,18 @@ from unittest.mock import MagicMock, patch
import pytest
from hermes_cli import main as cli_main
from hermes_constants import project_venv_dir
def _project_venv_root() -> Path:
"""Mirror the guards' lookup: the checkout's real venv/.venv, else venv/.
The guards resolve ``project_venv_dir(PROJECT_ROOT)`` at call time, so a
hard-coded ``venv`` diverges on hosts (CI included) whose checkout uses
``.venv``.
"""
venv_dir = project_venv_dir(cli_main.PROJECT_ROOT) or cli_main.PROJECT_ROOT / "venv"
return venv_dir.resolve() # the guards prefix-match on the resolved path
from hermes_cli import dashboard_procs
from hermes_cli import main_install_repair
from hermes_cli import update_cmd
@@ -646,7 +658,7 @@ def _fake_psutil_tree(tree, venv_exe, worker_exe, dead=None):
@patch.object(cli_main, "_is_windows", return_value=True)
def test_venv_launcher_ancestors_returns_venv_side_parent(_winp, monkeypatch):
"""The worker's venv-side parent is reported so the guard set is covered."""
venv_exe = str(cli_main.PROJECT_ROOT / "venv" / "Scripts" / "python.exe")
venv_exe = str(_project_venv_root() / "Scripts" / "python.exe")
worker_exe = r"C:\Users\x\AppData\Roaming\uv\python\cpython-3.11\python.exe"
# worker 200 -> launcher 100 (even == venv-side)
@@ -659,7 +671,7 @@ def test_venv_launcher_ancestors_returns_venv_side_parent(_winp, monkeypatch):
@patch.object(cli_main, "_is_windows", return_value=True)
def test_venv_launcher_ancestors_ignores_non_venv_parents(_winp, monkeypatch):
"""A Scheduled Task's cmd.exe / an operator shell is not a venv holder."""
venv_exe = str(cli_main.PROJECT_ROOT / "venv" / "Scripts" / "python.exe")
venv_exe = str(_project_venv_root() / "Scripts" / "python.exe")
worker_exe = r"C:\Windows\System32\cmd.exe"
# worker 200 -> parent 101 (odd == NOT venv-side)
@@ -691,7 +703,7 @@ def test_pause_kill_set_covers_venv_guard_abort_set(
import hermes_cli.gateway as gateway_mod
import gateway.status as status_mod
venv_exe = str(cli_main.PROJECT_ROOT / "venv" / "Scripts" / "python.exe")
venv_exe = str(_project_venv_root() / "Scripts" / "python.exe")
worker_exe = r"C:\Users\x\AppData\Roaming\uv\python\cpython-3.11\python.exe"
profile_home = tmp_path / "profiles" / "default"