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.
75 lines
3.0 KiB
Python
75 lines
3.0 KiB
Python
"""Regression guard for #14920: wildcard "*" in Discord channel config lists.
|
|
|
|
Setting ``allowed_channels: "*"``, ``free_response_channels: "*"``, or
|
|
``ignored_channels: "*"`` in config (or their ``DISCORD_*_CHANNELS`` env var
|
|
equivalents) must behave as a wildcard — i.e. the bot responds in every
|
|
channel (or is silenced in every channel, for the ignored list). Previously
|
|
the literal string "*" was placed into a set and compared against numeric
|
|
channel IDs via set-intersection, which always produced an empty set and
|
|
caused every message to be silently dropped (for ``allowed_channels``) or
|
|
every ``free_response`` / ``ignored`` check to fail open.
|
|
"""
|
|
|
|
import unittest
|
|
|
|
|
|
def _channel_is_allowed(channel_id: str, allowed_channels_raw: str) -> bool:
|
|
"""Replicate the channel-allow-list check from discord.py on_message."""
|
|
if not allowed_channels_raw:
|
|
return True
|
|
allowed_channels = {ch.strip() for ch in allowed_channels_raw.split(",") if ch.strip()}
|
|
if "*" in allowed_channels:
|
|
return True
|
|
return bool({channel_id} & allowed_channels)
|
|
|
|
|
|
def _channel_is_ignored(channel_id: str, ignored_channels_raw: str) -> bool:
|
|
"""Replicate the ignored-channel check from discord.py on_message."""
|
|
ignored_channels = {
|
|
ch.strip() for ch in ignored_channels_raw.split(",") if ch.strip()
|
|
}
|
|
return "*" in ignored_channels or bool({channel_id} & ignored_channels)
|
|
|
|
|
|
def _channel_is_free_response(channel_id: str, free_channels_raw: str) -> bool:
|
|
"""Replicate the free-response-channel check from discord.py on_message."""
|
|
free_channels = {
|
|
ch.strip() for ch in free_channels_raw.split(",") if ch.strip()
|
|
}
|
|
return "*" in free_channels or bool({channel_id} & free_channels)
|
|
|
|
|
|
class TestDiscordAllowedChannelsWildcard(unittest.TestCase):
|
|
"""Wildcard and channel-list behaviour for DISCORD_ALLOWED_CHANNELS."""
|
|
|
|
def test_wildcard_allows_any_channel(self):
|
|
"""'*' should allow messages from any channel ID."""
|
|
self.assertTrue(_channel_is_allowed("1234567890", "*"))
|
|
|
|
|
|
def test_exact_match_allowed(self):
|
|
"""Channel ID present in the explicit list is allowed."""
|
|
self.assertTrue(_channel_is_allowed("1234567890", "1234567890,9876543210"))
|
|
|
|
|
|
class TestDiscordIgnoredChannelsWildcard(unittest.TestCase):
|
|
"""Wildcard and channel-list behaviour for DISCORD_IGNORED_CHANNELS."""
|
|
|
|
def test_wildcard_silences_every_channel(self):
|
|
"""'*' in ignored_channels silences the bot everywhere."""
|
|
self.assertTrue(_channel_is_ignored("1234567890", "*"))
|
|
|
|
|
|
class TestDiscordFreeResponseChannelsWildcard(unittest.TestCase):
|
|
"""Wildcard and channel-list behaviour for DISCORD_FREE_RESPONSE_CHANNELS."""
|
|
|
|
def test_wildcard_makes_every_channel_free_response(self):
|
|
"""'*' in free_response_channels exempts every channel from mention-required."""
|
|
self.assertTrue(_channel_is_free_response("1234567890", "*"))
|
|
|
|
|
|
def test_exact_match_is_free_response(self):
|
|
self.assertTrue(_channel_is_free_response("111", "111,222"))
|
|
|
|
|