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.
90 lines
2.8 KiB
Python
90 lines
2.8 KiB
Python
"""End-to-end relay round-trip against the in-memory stub connector.
|
|
|
|
Proves the gateway side of the relay works with no real connector:
|
|
- connect() registers the inbound handler,
|
|
- a connector-delivered MessageEvent reaches the adapter's message path,
|
|
- SessionSource discriminators (scope_id) drive build_session_key isolation,
|
|
- an outbound send round-trips through the transport.
|
|
|
|
These target the transport contract + session-key derivation (Task 1.2's gate),
|
|
not the full agent turn — handle_message is patched to capture the event.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform, PlatformConfig
|
|
from gateway.platforms.base import MessageEvent, MessageType
|
|
from gateway.session import SessionSource, build_session_key
|
|
from gateway.relay.adapter import RelayAdapter
|
|
from gateway.relay.descriptor import CONTRACT_VERSION, CapabilityDescriptor
|
|
|
|
from dataclasses import replace
|
|
|
|
from tests.gateway.relay.stub_connector import StubConnector
|
|
|
|
|
|
def _discord_descriptor() -> CapabilityDescriptor:
|
|
return CapabilityDescriptor(
|
|
contract_version=CONTRACT_VERSION,
|
|
platform="discord",
|
|
label="Discord",
|
|
max_message_length=2000,
|
|
supports_draft_streaming=False,
|
|
supports_edit=True,
|
|
supports_threads=True,
|
|
markdown_dialect="discord",
|
|
len_unit="chars",
|
|
emoji="\U0001f47e",
|
|
platform_hint="You are on Discord.",
|
|
pii_safe=False,
|
|
)
|
|
|
|
|
|
def _discord_event(scope_id: str, channel_id: str, user_id: str, text: str) -> MessageEvent:
|
|
"""Synthetic inbound the connector would build from a discord.js message."""
|
|
source = SessionSource(
|
|
platform=Platform.DISCORD,
|
|
chat_id=channel_id,
|
|
chat_type="group",
|
|
user_id=user_id,
|
|
scope_id=scope_id,
|
|
)
|
|
return MessageEvent(text=text, message_type=MessageType.TEXT, source=source)
|
|
|
|
|
|
@pytest.fixture
|
|
def wired():
|
|
stub = StubConnector(_discord_descriptor())
|
|
adapter = RelayAdapter(PlatformConfig(), _discord_descriptor(), transport=stub)
|
|
return adapter, stub
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_connect_registers_inbound_handler(wired):
|
|
adapter, stub = wired
|
|
assert stub._inbound is None
|
|
ok = await adapter.connect()
|
|
assert ok is True
|
|
assert stub.connected is True
|
|
assert stub._inbound is not None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_inbound_event_reaches_adapter(wired, monkeypatch):
|
|
adapter, stub = wired
|
|
captured = []
|
|
monkeypatch.setattr(adapter, "handle_message", lambda ev: _async_capture(captured, ev))
|
|
await adapter.connect()
|
|
ev = _discord_event("guildA", "chan1", "userX", "hello")
|
|
await stub.push_inbound(ev)
|
|
assert len(captured) == 1
|
|
assert captured[0].text == "hello"
|
|
assert captured[0].source.scope_id == "guildA"
|
|
|
|
|
|
async def _async_capture(sink, event):
|
|
sink.append(event)
|
|
return None
|