mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
194 lines
5.8 KiB
Python
194 lines
5.8 KiB
Python
"""Tests for hermes_cli._early_recovery — the dependency-light bootstrap
|
|
repair that runs BEFORE hermes_cli.main's third-party imports (#57828 / #58004).
|
|
|
|
Covers:
|
|
- entry-point lifecycle: a broken core import (dotenv) crashes the import of
|
|
hermes_cli.main WITHOUT early recovery, and imports fine when recovery runs
|
|
first (proving main.py invokes recovery before its third-party imports)
|
|
- recover_if_needed unit behavior: fast path, marker gating, update-argv skip,
|
|
lock single-flight, no marker clearing, pinned repair specs
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import textwrap
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from hermes_cli import _early_recovery as er
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Entry-point lifecycle (subprocess, real imports)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _make_broken_dotenv_shadow(tmp_path: Path) -> Path:
|
|
"""A sys.path dir shadowing ``dotenv`` with the #57828 failure state:
|
|
distribution metadata intact, import files wiped/broken."""
|
|
shadow = tmp_path / "shadow"
|
|
shadow.mkdir()
|
|
(shadow / "dotenv.py").write_text(
|
|
"raise ImportError('import files wiped mid-install (#57828)')\n",
|
|
encoding="utf-8",
|
|
)
|
|
return shadow
|
|
|
|
|
|
def _run_lifecycle_subprocess(tmp_path: Path, *, repair: bool) -> subprocess.CompletedProcess:
|
|
shadow = _make_broken_dotenv_shadow(tmp_path)
|
|
hermes_home = tmp_path / "hermes_home"
|
|
hermes_home.mkdir()
|
|
script = tmp_path / "lifecycle.py"
|
|
script.write_text(
|
|
textwrap.dedent(
|
|
f"""
|
|
import sys
|
|
|
|
shadow = {str(shadow)!r}
|
|
sys.path.insert(0, shadow)
|
|
|
|
# _early_recovery must be importable on the corrupted venv
|
|
# (stdlib-only) — this import itself is part of the contract.
|
|
import hermes_cli._early_recovery as er
|
|
|
|
REPAIR = {repair!r}
|
|
|
|
def recorder(*args, **kwargs):
|
|
print("EARLY_RECOVERY_CALLED", flush=True)
|
|
if REPAIR:
|
|
sys.path.remove(shadow)
|
|
sys.modules.pop("dotenv", None)
|
|
|
|
er.recover_if_needed = recorder
|
|
|
|
import hermes_cli.main # noqa: F401
|
|
print("MAIN_IMPORTED_OK", flush=True)
|
|
"""
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
env = {
|
|
**os.environ,
|
|
"PYTHONPATH": str(REPO_ROOT),
|
|
"HERMES_HOME": str(hermes_home),
|
|
}
|
|
return subprocess.run(
|
|
[sys.executable, str(script)],
|
|
capture_output=True,
|
|
text=True,
|
|
cwd=REPO_ROOT,
|
|
env=env,
|
|
timeout=120,
|
|
)
|
|
|
|
|
|
def test_broken_dotenv_crashes_main_import_without_repair(tmp_path):
|
|
"""Negative control: the shadow really breaks importing hermes_cli.main,
|
|
and recovery was invoked BEFORE the crash (i.e. before third-party
|
|
imports) — so a real repair at that point can save the launch."""
|
|
result = _run_lifecycle_subprocess(tmp_path, repair=False)
|
|
assert result.returncode != 0
|
|
assert "EARLY_RECOVERY_CALLED" in result.stdout
|
|
assert "MAIN_IMPORTED_OK" not in result.stdout
|
|
assert "wiped mid-install" in result.stderr
|
|
|
|
|
|
|
|
|
|
def test_early_recovery_module_is_stdlib_only(tmp_path):
|
|
"""The module must import in a process where every non-stdlib import
|
|
fails — that is the whole point of its existence."""
|
|
script = tmp_path / "stdlib_only.py"
|
|
script.write_text(
|
|
textwrap.dedent(
|
|
"""
|
|
import builtins
|
|
import sys
|
|
|
|
STDLIB = set(sys.stdlib_module_names) | {"hermes_cli"}
|
|
real_import = builtins.__import__
|
|
|
|
def guard(name, *args, **kwargs):
|
|
top = name.split(".")[0]
|
|
if top not in STDLIB:
|
|
raise ImportError(f"non-stdlib import blocked: {name}")
|
|
return real_import(name, *args, **kwargs)
|
|
|
|
builtins.__import__ = guard
|
|
import hermes_cli._early_recovery # noqa: F401
|
|
print("STDLIB_ONLY_OK")
|
|
"""
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
result = subprocess.run(
|
|
[sys.executable, str(script)],
|
|
capture_output=True,
|
|
text=True,
|
|
cwd=REPO_ROOT,
|
|
env={**os.environ, "PYTHONPATH": str(REPO_ROOT)},
|
|
timeout=60,
|
|
)
|
|
assert "STDLIB_ONLY_OK" in result.stdout, result.stderr
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# recover_if_needed unit behavior
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _project(tmp_path: Path, *, pyproject: bool = True) -> Path:
|
|
root = tmp_path / "proj"
|
|
root.mkdir(exist_ok=True)
|
|
if pyproject:
|
|
(root / "pyproject.toml").write_text(
|
|
'[project]\nname = "x"\ndependencies = [\n'
|
|
' "PyYAML==6.0.2",\n'
|
|
' "python-dotenv==1.2.2",\n'
|
|
' "PyJWT[crypto]==2.13.0",\n'
|
|
"]\n",
|
|
encoding="utf-8",
|
|
)
|
|
return root
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_marker_plus_broken_probe_repairs_with_pinned_specs(tmp_path, monkeypatch):
|
|
root = _project(tmp_path)
|
|
marker = root / ".lazy-refresh-incomplete"
|
|
marker.write_text("x", encoding="utf-8")
|
|
|
|
probe_results = iter([["PyYAML", "python-dotenv"], []])
|
|
monkeypatch.setattr(er, "_probe_broken_packages", lambda: next(probe_results))
|
|
installs = []
|
|
monkeypatch.setattr(
|
|
er, "_run_repair_install", lambda specs, r: installs.append(specs) or True
|
|
)
|
|
|
|
er.recover_if_needed(project_root=root, argv=[])
|
|
|
|
assert installs == [["PyYAML==6.0.2", "python-dotenv==1.2.2"]]
|
|
# Marker lifecycle belongs to main.py's full recovery — never cleared here.
|
|
assert marker.exists()
|
|
# Lock released for the full recovery pass.
|
|
assert not (root / ".update-incomplete.lock").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|