mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
39975613b1
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.
91 lines
3.4 KiB
Python
91 lines
3.4 KiB
Python
"""Legacy pythonw launcher normalization + post-update launcher refresh.
|
|
|
|
Covers the two halves of the "legacy pythonw gateways survive updates
|
|
forever" gap:
|
|
|
|
1. ``gateway_windows._resolve_detached_python`` — normalizes a legacy
|
|
``pythonw.exe`` interpreter (pre-aa2ae36c3f launchers / argv snapshots)
|
|
to the sibling console ``python.exe`` so respawns and regenerated
|
|
launchers use the hidden-console design (#54220/#56747) and don't die
|
|
with ``RuntimeError: sys.stderr is None`` (#71671).
|
|
2. ``hermes_cli.main._refresh_windows_gateway_launchers`` — ``hermes
|
|
update`` regenerates the installed Scheduled Task / Startup launcher
|
|
scripts instead of leaving install-time artifacts stale forever.
|
|
|
|
Windows-specific paths are exercised via ``_is_windows`` patching so they
|
|
run on any host (same approach as test_update_venv_health).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
from unittest import mock
|
|
|
|
import hermes_cli.gateway_windows as gateway_windows
|
|
import hermes_cli.main as cli_main
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _resolve_detached_python: legacy pythonw normalization
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _make_venv(tmp_path: Path, *, with_console_python: bool) -> tuple[Path, Path]:
|
|
scripts = tmp_path / "venv" / "Scripts"
|
|
scripts.mkdir(parents=True)
|
|
pythonw = scripts / "pythonw.exe"
|
|
pythonw.write_text("", encoding="utf-8")
|
|
python = scripts / "python.exe"
|
|
if with_console_python:
|
|
python.write_text("", encoding="utf-8")
|
|
return pythonw, python
|
|
|
|
|
|
def test_resolve_detached_python_swaps_legacy_pythonw_for_console_sibling(tmp_path):
|
|
pythonw, python = _make_venv(tmp_path, with_console_python=True)
|
|
|
|
exe, venv_dir, extra = gateway_windows._resolve_detached_python(str(pythonw))
|
|
|
|
assert exe == str(python)
|
|
assert venv_dir == tmp_path / "venv"
|
|
assert extra == []
|
|
|
|
|
|
|
|
|
|
def test_restart_spec_normalizes_legacy_pythonw_argv(tmp_path):
|
|
"""A pre-rework Scheduled Task argv snapshot (leading pythonw.exe) must be
|
|
respawned through the console python + hidden-console launch, with every
|
|
argument after the interpreter preserved verbatim."""
|
|
pythonw, python = _make_venv(tmp_path, with_console_python=True)
|
|
|
|
# Pre-import so the function's lazy imports resolve from sys.modules
|
|
# instead of re-importing under the win32 platform patch (see the
|
|
# TestWindowlessGatewayRestartSpec comment in
|
|
# tests/tools/test_windows_native_support.py).
|
|
import hermes_cli.config # noqa: F401
|
|
import hermes_cli.gateway # noqa: F401
|
|
|
|
argv = [str(pythonw), "-m", "hermes_cli.main", "gateway", "run"]
|
|
with mock.patch.object(gateway_windows.sys, "platform", "win32"), mock.patch.object(
|
|
gateway_windows, "_stable_gateway_working_dir", return_value=str(tmp_path)
|
|
), mock.patch("hermes_cli.config.get_hermes_home", return_value=str(tmp_path)):
|
|
new_argv, cwd, env = gateway_windows.windowless_gateway_restart_spec(list(argv))
|
|
|
|
assert new_argv[0] == str(python)
|
|
assert new_argv[1:] == argv[1:]
|
|
assert cwd == str(tmp_path)
|
|
assert env["VIRTUAL_ENV"] == str(tmp_path / "venv")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _refresh_windows_gateway_launchers: hermes update regenerates launchers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|