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.
72 lines
2.7 KiB
Python
72 lines
2.7 KiB
Python
"""Regression tests: ``_apply_env_overrides`` must not lazy-install platform
|
|
SDKs for platforms the user has not configured.
|
|
|
|
For adapter plugins, ``PlatformEntry.check_fn`` doubles as the lazy-installer
|
|
(it pip-installs the platform SDK as a side effect — see e.g.
|
|
``plugins/platforms/discord/adapter.py::check_discord_requirements``). The
|
|
enablement sweep in ``_apply_env_overrides`` used to call ``check_fn`` for
|
|
*every* registered plugin platform unconditionally, so a single
|
|
``load_gateway_config()`` — which the desktop/dashboard readiness probe
|
|
(``GET /api/status``) awaits synchronously — pip-installed Discord, Telegram,
|
|
Slack, Feishu and Dingtalk even with ``platforms: none``. That blocked
|
|
startup until every install finished and made the desktop app time out and
|
|
boot-loop (stuck at 94%).
|
|
|
|
The fix consults the cheap ``is_connected`` credential check FIRST and only
|
|
runs the install-triggering ``check_fn`` for platforms that are already
|
|
enabled or actually configured. These tests pin that contract.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from gateway.config import GatewayConfig, Platform, PlatformConfig, _apply_env_overrides
|
|
from gateway.platform_registry import PlatformEntry, platform_registry
|
|
|
|
|
|
@pytest.fixture
|
|
def isolated_registry():
|
|
"""Run with a registry containing only the entries the test registers."""
|
|
original = dict(platform_registry._entries)
|
|
platform_registry._entries.clear()
|
|
try:
|
|
# ``_apply_env_overrides`` calls ``discover_plugins()`` (idempotent),
|
|
# which would re-register the real bundled platforms and clobber the
|
|
# fakes below. Neutralize it so the test controls the registry.
|
|
with patch("hermes_cli.plugins.discover_plugins", lambda *a, **k: None):
|
|
yield platform_registry
|
|
finally:
|
|
platform_registry._entries.clear()
|
|
platform_registry._entries.update(original)
|
|
|
|
|
|
def _register_fake_platform(name, *, check_fn, is_connected):
|
|
platform_registry.register(
|
|
PlatformEntry(
|
|
name=name,
|
|
label=name.title(),
|
|
adapter_factory=lambda cfg: MagicMock(),
|
|
check_fn=check_fn,
|
|
is_connected=is_connected,
|
|
source="plugin",
|
|
)
|
|
)
|
|
|
|
|
|
def test_unconfigured_platform_is_not_probed_for_install(isolated_registry):
|
|
# is_connected reports "no credentials" → the platform must be skipped
|
|
# without ever calling check_fn (which would lazy-install the SDK).
|
|
check_fn = MagicMock(return_value=True)
|
|
_register_fake_platform(
|
|
"discord", check_fn=check_fn, is_connected=lambda cfg: False
|
|
)
|
|
|
|
config = GatewayConfig()
|
|
_apply_env_overrides(config)
|
|
|
|
check_fn.assert_not_called()
|
|
assert not config.platforms.get(Platform.DISCORD, PlatformConfig()).enabled
|
|
|
|
|