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.
84 lines
2.5 KiB
Python
84 lines
2.5 KiB
Python
"""Discord approval prompts can opt into owner mentions."""
|
|
|
|
import os
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
from plugins.platforms.discord.adapter import (
|
|
DiscordAdapter,
|
|
_apply_yaml_config,
|
|
)
|
|
|
|
|
|
class _FakeChannel:
|
|
def __init__(self):
|
|
self.sent_kwargs = None
|
|
|
|
async def send(self, **kwargs):
|
|
self.sent_kwargs = kwargs
|
|
return SimpleNamespace(id=12345)
|
|
|
|
|
|
class _FakeClient:
|
|
def __init__(self, channel):
|
|
self.channel = channel
|
|
|
|
def get_channel(self, channel_id):
|
|
return self.channel
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_exec_approval_mentions_allowed_users_when_enabled(monkeypatch):
|
|
monkeypatch.setenv("DISCORD_APPROVAL_MENTIONS", "true")
|
|
channel = _FakeChannel()
|
|
adapter = object.__new__(DiscordAdapter)
|
|
adapter._client = _FakeClient(channel)
|
|
adapter._allowed_user_ids = {"222", "111", "alice"}
|
|
adapter._allowed_role_ids = set()
|
|
adapter.config = SimpleNamespace(extra=None)
|
|
|
|
result = await adapter.send_exec_approval(
|
|
chat_id="99",
|
|
command="make check",
|
|
session_key="session-1",
|
|
description="dangerous command",
|
|
)
|
|
|
|
assert result.success is True
|
|
# Mentions are prepended to the (always present) content mirror.
|
|
assert channel.sent_kwargs["content"].startswith("<@111> <@222>\n")
|
|
assert "make check" in channel.sent_kwargs["content"]
|
|
assert "allowed_mentions" in channel.sent_kwargs
|
|
assert channel.sent_kwargs["embed"].title.endswith("Command Approval Required")
|
|
|
|
|
|
def test_yaml_config_seeds_websocket_health_with_primary_precedence(monkeypatch):
|
|
for key in (
|
|
"HERMES_DISCORD_LIVENESS_INTERVAL_SECONDS",
|
|
"HERMES_DISCORD_LIVENESS_FAILURE_THRESHOLD",
|
|
):
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
seeded = _apply_yaml_config(
|
|
{},
|
|
{
|
|
"websocket_liveness_interval_seconds": 11,
|
|
"liveness_interval_seconds": 99,
|
|
"websocket_liveness_failure_threshold": 2,
|
|
"websocket_heartbeat_ack_max_age_seconds": 75,
|
|
"websocket_max_latency_seconds": 30,
|
|
},
|
|
)
|
|
|
|
assert os.environ["HERMES_DISCORD_LIVENESS_INTERVAL_SECONDS"] == "11"
|
|
assert os.environ["HERMES_DISCORD_LIVENESS_FAILURE_THRESHOLD"] == "2"
|
|
assert seeded == {
|
|
"websocket_liveness_interval_seconds": 11,
|
|
"websocket_liveness_failure_threshold": 2,
|
|
"websocket_heartbeat_ack_max_age_seconds": 75,
|
|
"websocket_max_latency_seconds": 30,
|
|
}
|
|
|
|
|