Teknium
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.
214 lines
8.3 KiB
Python
214 lines
8.3 KiB
Python
"""Tests for the WhatsApp stale-bridge staleness handshake.
|
|
|
|
Regression tests for the stale-bridge trap: ``connect()`` reused any
|
|
already-running bridge with ``status: connected`` unconditionally, and
|
|
``disconnect()`` only kills bridges the adapter spawned itself. A
|
|
long-lived bridge process therefore survived gateway restarts AND
|
|
``hermes update``, serving pre-update bridge.js behavior forever (e.g.
|
|
no inbound media download → images/voice notes arrive as placeholders).
|
|
|
|
The fix: bridge.js reports a hash of its own source in ``/health``
|
|
(``scriptHash``); the adapter compares it against the bridge.js on disk
|
|
and restarts the bridge on mismatch. Bridges that predate the handshake
|
|
report no hash and are treated as stale by definition.
|
|
|
|
Also covers the npm dependency-refresh stamp: deps are reinstalled when
|
|
package.json changes, not only when node_modules is missing.
|
|
"""
|
|
|
|
import asyncio
|
|
from pathlib import Path
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform
|
|
|
|
|
|
class _AsyncCM:
|
|
"""Minimal async context manager returning a fixed value."""
|
|
|
|
def __init__(self, value):
|
|
self.value = value
|
|
|
|
async def __aenter__(self):
|
|
return self.value
|
|
|
|
async def __aexit__(self, *exc):
|
|
return False
|
|
|
|
|
|
def _make_adapter(bridge_script: str = "/tmp/test-bridge.js",
|
|
session_path: Path = Path("/tmp/test-wa-session")):
|
|
"""Create a WhatsAppAdapter with test attributes (bypass __init__)."""
|
|
from plugins.platforms.whatsapp.adapter import WhatsAppAdapter
|
|
|
|
adapter = WhatsAppAdapter.__new__(WhatsAppAdapter)
|
|
adapter.platform = Platform.WHATSAPP
|
|
adapter.config = MagicMock()
|
|
adapter._bridge_port = 19876
|
|
adapter._bridge_script = bridge_script
|
|
adapter._session_path = session_path
|
|
adapter._bridge_log_fh = None
|
|
adapter._bridge_log = None
|
|
adapter._bridge_process = None
|
|
adapter._reply_prefix = None
|
|
adapter._send_read_receipts = False
|
|
adapter._running = False
|
|
adapter._message_handler = None
|
|
adapter._fatal_error_code = None
|
|
adapter._fatal_error_message = None
|
|
adapter._fatal_error_retryable = True
|
|
adapter._fatal_error_handler = None
|
|
adapter._active_sessions = {}
|
|
adapter._pending_messages = {}
|
|
adapter._background_tasks = set()
|
|
adapter._auto_tts_disabled_chats = set()
|
|
adapter._message_queue = asyncio.Queue()
|
|
adapter._http_session = None
|
|
return adapter
|
|
|
|
|
|
def _mock_health(json_data):
|
|
"""Mock aiohttp.ClientSession whose GET returns 200 + *json_data*."""
|
|
mock_resp = MagicMock()
|
|
mock_resp.status = 200
|
|
mock_resp.json = AsyncMock(return_value=json_data)
|
|
mock_session = MagicMock()
|
|
mock_session.get = MagicMock(return_value=_AsyncCM(mock_resp))
|
|
mock_session.close = AsyncMock()
|
|
return MagicMock(return_value=_AsyncCM(mock_session))
|
|
|
|
|
|
def _setup_bridge_dir(tmp_path: Path) -> Path:
|
|
"""Create a real bridge dir with bridge.js + package.json + creds."""
|
|
bridge_dir = tmp_path / "whatsapp-bridge"
|
|
bridge_dir.mkdir()
|
|
(bridge_dir / "bridge.js").write_text("// current bridge code\n")
|
|
(bridge_dir / "package.json").write_text('{"name": "bridge"}\n')
|
|
session_path = tmp_path / "session"
|
|
session_path.mkdir()
|
|
(session_path / "creds.json").write_text("{}")
|
|
return bridge_dir
|
|
|
|
|
|
def _fresh_node_modules(bridge_dir: Path) -> None:
|
|
"""Create node_modules with a stamp matching the current package.json."""
|
|
from plugins.platforms.whatsapp.adapter import _file_content_hash
|
|
|
|
nm = bridge_dir / "node_modules"
|
|
nm.mkdir()
|
|
(nm / ".hermes-pkg-hash").write_text(
|
|
_file_content_hash(bridge_dir / "package.json")
|
|
)
|
|
|
|
|
|
class TestFileContentHash:
|
|
def test_hashes_file(self, tmp_path):
|
|
from plugins.platforms.whatsapp.adapter import _file_content_hash
|
|
|
|
f = tmp_path / "x.js"
|
|
f.write_text("abc")
|
|
h = _file_content_hash(f)
|
|
assert len(h) == 16
|
|
assert h == _file_content_hash(f) # deterministic
|
|
|
|
|
|
class TestStaleBridgeHandshake:
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_restarts_bridge_when_read_receipt_config_changed(self, tmp_path):
|
|
from plugins.platforms.whatsapp.adapter import _file_content_hash
|
|
|
|
bridge_dir = _setup_bridge_dir(tmp_path)
|
|
_fresh_node_modules(bridge_dir)
|
|
adapter = _make_adapter(
|
|
bridge_script=str(bridge_dir / "bridge.js"),
|
|
session_path=tmp_path / "session",
|
|
)
|
|
adapter._send_read_receipts = True
|
|
disk_hash = _file_content_hash(bridge_dir / "bridge.js")
|
|
mock_client = _mock_health(
|
|
{
|
|
"status": "connected",
|
|
"scriptHash": disk_hash,
|
|
"sendReadReceipts": False,
|
|
}
|
|
)
|
|
mock_proc = MagicMock()
|
|
mock_proc.poll.return_value = 1
|
|
mock_proc.returncode = 1
|
|
|
|
with patch("plugins.platforms.whatsapp.adapter.check_whatsapp_requirements", return_value=True), \
|
|
patch("aiohttp.ClientSession", mock_client), \
|
|
patch("plugins.platforms.whatsapp.adapter.asyncio.sleep", new_callable=AsyncMock), \
|
|
patch("plugins.platforms.whatsapp.adapter._kill_stale_bridge_by_pidfile"), \
|
|
patch("plugins.platforms.whatsapp.adapter._kill_port_process"), \
|
|
patch("subprocess.Popen", return_value=mock_proc) as mock_popen, \
|
|
patch.object(adapter, "_acquire_platform_lock", return_value=True, create=True):
|
|
await adapter.connect()
|
|
|
|
mock_popen.assert_called_once()
|
|
|
|
|
|
class TestDepRefreshStamp:
|
|
@pytest.mark.asyncio
|
|
async def test_skips_install_when_stamp_fresh(self, tmp_path):
|
|
bridge_dir = _setup_bridge_dir(tmp_path)
|
|
_fresh_node_modules(bridge_dir)
|
|
adapter = _make_adapter(
|
|
bridge_script=str(bridge_dir / "bridge.js"),
|
|
session_path=tmp_path / "session",
|
|
)
|
|
mock_proc = MagicMock()
|
|
mock_proc.poll.return_value = 1
|
|
mock_proc.returncode = 1
|
|
|
|
with patch("plugins.platforms.whatsapp.adapter.check_whatsapp_requirements", return_value=True), \
|
|
patch("aiohttp.ClientSession", _mock_health({"status": "disconnected"})), \
|
|
patch("plugins.platforms.whatsapp.adapter.asyncio.sleep", new_callable=AsyncMock), \
|
|
patch("plugins.platforms.whatsapp.adapter._kill_stale_bridge_by_pidfile"), \
|
|
patch("plugins.platforms.whatsapp.adapter._kill_port_process"), \
|
|
patch("subprocess.run") as mock_run, \
|
|
patch("subprocess.Popen", return_value=mock_proc), \
|
|
patch.object(adapter, "_acquire_platform_lock", return_value=True, create=True):
|
|
await adapter.connect()
|
|
|
|
mock_run.assert_not_called()
|
|
|
|
|
|
class TestCacheDirEnvPassthrough:
|
|
@pytest.mark.asyncio
|
|
async def test_bridge_spawn_env_has_cache_dirs(self, tmp_path):
|
|
bridge_dir = _setup_bridge_dir(tmp_path)
|
|
_fresh_node_modules(bridge_dir)
|
|
adapter = _make_adapter(
|
|
bridge_script=str(bridge_dir / "bridge.js"),
|
|
session_path=tmp_path / "session",
|
|
)
|
|
adapter._send_read_receipts = True
|
|
mock_proc = MagicMock()
|
|
mock_proc.poll.return_value = 1
|
|
mock_proc.returncode = 1
|
|
|
|
with patch("plugins.platforms.whatsapp.adapter.check_whatsapp_requirements", return_value=True), \
|
|
patch("aiohttp.ClientSession", _mock_health({"status": "disconnected"})), \
|
|
patch("plugins.platforms.whatsapp.adapter.asyncio.sleep", new_callable=AsyncMock), \
|
|
patch("plugins.platforms.whatsapp.adapter._kill_stale_bridge_by_pidfile"), \
|
|
patch("plugins.platforms.whatsapp.adapter._kill_port_process"), \
|
|
patch("subprocess.Popen", return_value=mock_proc) as mock_popen, \
|
|
patch.object(adapter, "_acquire_platform_lock", return_value=True, create=True):
|
|
await adapter.connect()
|
|
|
|
env = mock_popen.call_args.kwargs["env"]
|
|
from gateway.platforms.base import (
|
|
get_audio_cache_dir,
|
|
get_document_cache_dir,
|
|
get_image_cache_dir,
|
|
)
|
|
assert env["HERMES_IMAGE_CACHE_DIR"] == str(get_image_cache_dir())
|
|
assert env["HERMES_AUDIO_CACHE_DIR"] == str(get_audio_cache_dir())
|
|
assert env["HERMES_DOCUMENT_CACHE_DIR"] == str(get_document_cache_dir())
|
|
assert env["WHATSAPP_SEND_READ_RECEIPTS"] == "true"
|