mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-30 19:09:28 +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.
134 lines
5.7 KiB
Python
134 lines
5.7 KiB
Python
"""Tests for foreground timeout cap in terminal_tool.
|
|
|
|
Ensures that foreground commands with timeout > FOREGROUND_MAX_TIMEOUT
|
|
are rejected with an error suggesting background=true.
|
|
"""
|
|
import json
|
|
from unittest.mock import patch, MagicMock
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Shared test config dict — mirrors _get_env_config() return shape.
|
|
# ---------------------------------------------------------------------------
|
|
def _make_env_config(**overrides):
|
|
"""Return a minimal _get_env_config()-shaped dict with optional overrides."""
|
|
config = {
|
|
"env_type": "local",
|
|
"timeout": 180,
|
|
"cwd": "/tmp",
|
|
"host_cwd": None,
|
|
"modal_mode": "auto",
|
|
"docker_image": "",
|
|
"singularity_image": "",
|
|
"modal_image": "",
|
|
"daytona_image": "",
|
|
}
|
|
config.update(overrides)
|
|
return config
|
|
|
|
|
|
class TestForegroundTimeoutCap:
|
|
"""FOREGROUND_MAX_TIMEOUT rejects foreground commands that exceed it."""
|
|
|
|
def test_foreground_timeout_rejected_above_max(self):
|
|
"""When model requests timeout > FOREGROUND_MAX_TIMEOUT, return error."""
|
|
from tools.terminal_tool import terminal_tool, FOREGROUND_MAX_TIMEOUT
|
|
|
|
with patch("tools.terminal_tool._get_env_config", return_value=_make_env_config()), \
|
|
patch("tools.terminal_tool._start_cleanup_thread"):
|
|
|
|
result = json.loads(terminal_tool(
|
|
command="echo hello",
|
|
timeout=9999, # Way above max
|
|
))
|
|
|
|
assert "error" in result
|
|
assert "9999" in result["error"]
|
|
assert str(FOREGROUND_MAX_TIMEOUT) in result["error"]
|
|
assert "background=true" in result["error"]
|
|
|
|
|
|
def test_foreground_allows_help_variant_for_server_command(self):
|
|
"""Informational variants like '--help' should not be blocked."""
|
|
from tools.terminal_tool import terminal_tool
|
|
|
|
with patch("tools.terminal_tool._get_env_config", return_value=_make_env_config()), \
|
|
patch("tools.terminal_tool._start_cleanup_thread"):
|
|
|
|
mock_env = MagicMock()
|
|
mock_env.execute.return_value = {"output": "usage", "returncode": 0}
|
|
|
|
with patch("tools.terminal_tool._active_environments", {"default": mock_env}), \
|
|
patch("tools.terminal_tool._last_activity", {"default": 0}), \
|
|
patch("tools.terminal_tool._check_all_guards", return_value={"approved": True}):
|
|
result = json.loads(terminal_tool(command="pnpm dev --help"))
|
|
|
|
assert result["error"] is None
|
|
call_kwargs = mock_env.execute.call_args
|
|
assert call_kwargs[0][0] == "pnpm dev --help"
|
|
|
|
|
|
def test_config_default_above_cap_not_rejected(self):
|
|
"""When config default timeout > cap but model passes no timeout, execute normally.
|
|
|
|
Only the model's explicit timeout parameter triggers rejection,
|
|
not the user's configured default.
|
|
"""
|
|
from tools.terminal_tool import terminal_tool
|
|
|
|
# User configured TERMINAL_TIMEOUT=900 in their env
|
|
with patch("tools.terminal_tool._get_env_config",
|
|
return_value=_make_env_config(timeout=900)), \
|
|
patch("tools.terminal_tool._start_cleanup_thread"):
|
|
|
|
mock_env = MagicMock()
|
|
mock_env.execute.return_value = {"output": "done", "returncode": 0}
|
|
|
|
with patch("tools.terminal_tool._active_environments", {"default": mock_env}), \
|
|
patch("tools.terminal_tool._last_activity", {"default": 0}), \
|
|
patch("tools.terminal_tool._check_all_guards", return_value={"approved": True}):
|
|
result = json.loads(terminal_tool(command="make build"))
|
|
|
|
# Should execute with the config default, NOT be rejected
|
|
call_kwargs = mock_env.execute.call_args
|
|
assert call_kwargs[1]["timeout"] == 900
|
|
assert "error" not in result or result["error"] is None
|
|
|
|
|
|
def test_exactly_at_max_not_rejected(self):
|
|
"""Timeout exactly at FOREGROUND_MAX_TIMEOUT should execute normally."""
|
|
from tools.terminal_tool import terminal_tool, FOREGROUND_MAX_TIMEOUT
|
|
|
|
with patch("tools.terminal_tool._get_env_config", return_value=_make_env_config()), \
|
|
patch("tools.terminal_tool._start_cleanup_thread"):
|
|
|
|
mock_env = MagicMock()
|
|
mock_env.execute.return_value = {"output": "done", "returncode": 0}
|
|
|
|
with patch("tools.terminal_tool._active_environments", {"default": mock_env}), \
|
|
patch("tools.terminal_tool._last_activity", {"default": 0}), \
|
|
patch("tools.terminal_tool._check_all_guards", return_value={"approved": True}):
|
|
result = json.loads(terminal_tool(
|
|
command="echo hello",
|
|
timeout=FOREGROUND_MAX_TIMEOUT, # Exactly at limit
|
|
))
|
|
|
|
call_kwargs = mock_env.execute.call_args
|
|
assert call_kwargs[1]["timeout"] == FOREGROUND_MAX_TIMEOUT
|
|
assert "error" not in result or result["error"] is None
|
|
|
|
|
|
class TestForegroundMaxTimeoutConstant:
|
|
"""Verify the FOREGROUND_MAX_TIMEOUT constant and schema."""
|
|
|
|
def test_default_value_is_600(self):
|
|
"""Default FOREGROUND_MAX_TIMEOUT is 600 when env var is not set."""
|
|
from tools.terminal_tool import FOREGROUND_MAX_TIMEOUT
|
|
assert FOREGROUND_MAX_TIMEOUT == 600
|
|
|
|
def test_schema_mentions_max(self):
|
|
"""Tool schema description should mention the max timeout."""
|
|
from tools.terminal_tool import TERMINAL_SCHEMA, FOREGROUND_MAX_TIMEOUT
|
|
timeout_desc = TERMINAL_SCHEMA["parameters"]["properties"]["timeout"]["description"]
|
|
assert str(FOREGROUND_MAX_TIMEOUT) in timeout_desc
|
|
assert "background=true" in timeout_desc
|