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.
83 lines
2.8 KiB
Python
83 lines
2.8 KiB
Python
"""Tests for the MCP remote-URL validator.
|
|
|
|
Ported from anomalyco/opencode#25019 (``fix: handle invalid mcp urls``).
|
|
|
|
Previously, a typo in ``config.yaml`` (missing scheme, wrong scheme, empty
|
|
string, dict where a URL was expected) caused the MCP server startup code
|
|
to enter httpx's URL-parsing path and crash inside the transport layer.
|
|
The reconnect-backoff loop would then retry
|
|
``_MAX_INITIAL_CONNECT_RETRIES`` times with doubling backoff — a minute or
|
|
more of pointless retries plus a confusing opaque error message — before
|
|
eventually giving up.
|
|
|
|
The fix validates the URL once, up front, and fails fast with a specific
|
|
error message identifying the offending server.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from tools.mcp_tool import (
|
|
InvalidMcpUrlError,
|
|
_validate_remote_mcp_url,
|
|
)
|
|
|
|
|
|
class TestValidUrlsAccepted:
|
|
"""Every valid http(s) URL must pass through untouched (stripped of whitespace)."""
|
|
|
|
@pytest.mark.parametrize(
|
|
"url",
|
|
[
|
|
"http://localhost:3000/mcp",
|
|
"https://example.com/mcp",
|
|
"https://context7.liam.com/mcp",
|
|
"http://127.0.0.1:8080",
|
|
"https://api.example.com:443/v1/mcp?session=abc",
|
|
"http://[::1]:9000/mcp", # IPv6
|
|
"https://host.example.com", # no port, no path
|
|
],
|
|
)
|
|
def test_accepts_valid_http_url(self, url):
|
|
assert _validate_remote_mcp_url("test", url) == url
|
|
|
|
def test_strips_surrounding_whitespace(self):
|
|
assert (
|
|
_validate_remote_mcp_url("test", " https://example.com/mcp ")
|
|
== "https://example.com/mcp"
|
|
)
|
|
|
|
|
|
class TestInvalidUrlsRejected:
|
|
"""Every broken shape must raise ``InvalidMcpUrlError`` with a clear message."""
|
|
|
|
def test_none_rejected(self):
|
|
with pytest.raises(InvalidMcpUrlError, match="context7.*expected a string"):
|
|
_validate_remote_mcp_url("context7", None)
|
|
|
|
def test_dict_rejected(self):
|
|
with pytest.raises(InvalidMcpUrlError, match="expected a string, got dict"):
|
|
_validate_remote_mcp_url("ctx", {"url": "nested"})
|
|
|
|
def test_int_rejected(self):
|
|
with pytest.raises(InvalidMcpUrlError, match="expected a string, got int"):
|
|
_validate_remote_mcp_url("ctx", 8080)
|
|
|
|
|
|
def test_error_mentions_server_name(self):
|
|
# So users can find the bad entry when there are multiple configured.
|
|
with pytest.raises(InvalidMcpUrlError, match="my-weird-server"):
|
|
_validate_remote_mcp_url("my-weird-server", "not a url at all")
|
|
|
|
|
|
class TestErrorIsValueError:
|
|
"""InvalidMcpUrlError must be a ValueError for broad downstream catch blocks."""
|
|
|
|
def test_is_value_error(self):
|
|
try:
|
|
_validate_remote_mcp_url("ctx", "garbage")
|
|
except ValueError:
|
|
pass # expected
|
|
else:
|
|
pytest.fail("expected ValueError")
|