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.
67 lines
2.6 KiB
Python
67 lines
2.6 KiB
Python
"""Tests for docker container_config key propagation in file_tools."""
|
|
|
|
from unittest.mock import patch, MagicMock
|
|
import tools.file_tools as file_tools
|
|
|
|
|
|
def _make_env_config(**overrides):
|
|
base = {
|
|
"env_type": "docker",
|
|
"docker_image": "test-image:latest",
|
|
"singularity_image": "docker://test",
|
|
"modal_image": "test",
|
|
"daytona_image": "test",
|
|
"cwd": "/workspace",
|
|
"host_cwd": None,
|
|
"timeout": 180,
|
|
"container_cpu": 2,
|
|
"container_memory": 4096,
|
|
"container_disk": 20480,
|
|
"container_persistent": False,
|
|
"docker_volumes": [],
|
|
"docker_mount_cwd_to_workspace": True,
|
|
"docker_forward_env": ["MY_SECRET", "API_KEY"],
|
|
}
|
|
base.update(overrides)
|
|
return base
|
|
|
|
|
|
class TestFileToolsContainerConfig:
|
|
def _run(self, env_config, task_id, task_env_overrides=None):
|
|
captured = {}
|
|
mock_env = MagicMock()
|
|
|
|
def fake_create_env(**kwargs):
|
|
captured.update(kwargs)
|
|
return mock_env
|
|
|
|
with patch("tools.terminal_tool._get_env_config", return_value=env_config), \
|
|
patch("tools.terminal_tool._task_env_overrides", task_env_overrides or {}), \
|
|
patch("tools.terminal_tool._active_environments", {}), \
|
|
patch("tools.terminal_tool._creation_locks", {}), \
|
|
patch("tools.terminal_tool._creation_locks_lock", __import__("threading").Lock()), \
|
|
patch("tools.terminal_tool._create_environment", side_effect=fake_create_env), \
|
|
patch("tools.terminal_tool._start_cleanup_thread"), \
|
|
patch("tools.terminal_tool._check_disk_usage_warning"), \
|
|
patch("tools.file_tools._file_ops_cache", {}), \
|
|
patch("tools.file_tools._file_ops_lock", __import__("threading").Lock()):
|
|
file_tools._get_file_ops(task_id)
|
|
|
|
return captured
|
|
|
|
def test_docker_mount_cwd_to_workspace_passed(self):
|
|
"""docker_mount_cwd_to_workspace is forwarded to container_config."""
|
|
cc = self._run(_make_env_config(docker_mount_cwd_to_workspace=True), "t1").get("container_config", {})
|
|
assert cc.get("docker_mount_cwd_to_workspace") is True
|
|
|
|
|
|
def test_cwd_only_raw_task_override_reaches_file_environment(self):
|
|
"""CWD-only task overrides collapse to default but must keep their cwd."""
|
|
captured = self._run(
|
|
_make_env_config(env_type="local", cwd="/config-cwd"),
|
|
"desktop-session-cwd",
|
|
task_env_overrides={"desktop-session-cwd": {"cwd": "/workspace/session"}},
|
|
)
|
|
|
|
assert captured["task_id"] == "default"
|
|
assert captured["cwd"] == "/workspace/session"
|