hermes-agent/tests/gateway/test_clean_shutdown_marker.py
Teknium 39975613b1
test: prune wave 2 + speed fixes — 28,106 → 19,757 test functions, suite wall 315s → 294s
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.
2026-07-29 13:39:40 -07:00

201 lines
8.4 KiB
Python

"""Tests for the clean shutdown marker that prevents unwanted session auto-resets.
When the gateway shuts down gracefully (hermes update, gateway restart, /restart),
it writes a .clean_shutdown marker. On the next startup, if the marker exists,
suspend_recently_active() is skipped so users don't lose their sessions.
After a crash (no marker), suspension still fires as a safety net for stuck sessions.
"""
from datetime import datetime, timedelta
from unittest.mock import AsyncMock, MagicMock, patch
from gateway.config import GatewayConfig, Platform
from gateway.session import SessionSource, SessionStore
# ---------------------------------------------------------------------------
# Helpers
# ---------------------------------------------------------------------------
def _make_source(platform=Platform.TELEGRAM, chat_id="123", user_id="u1"):
return SessionSource(platform=platform, chat_id=chat_id, user_id=user_id)
def _make_store(tmp_path, policy=None):
config = GatewayConfig()
if policy:
config.default_reset_policy = policy
return SessionStore(sessions_dir=tmp_path, config=config)
# ---------------------------------------------------------------------------
# SessionStore.suspend_recently_active
# ---------------------------------------------------------------------------
class TestSuspendRecentlyActive:
"""Verify suspend_recently_active only marks recent sessions."""
def test_suspends_recently_active_sessions(self, tmp_path):
store = _make_store(tmp_path)
source = _make_source()
entry = store.get_or_create_session(source)
assert not entry.suspended
count = store.suspend_recently_active()
assert count == 1
# Re-fetch — should be resume_pending (preserved, not wiped)
refreshed = store.get_or_create_session(source)
assert refreshed.resume_pending
assert refreshed.session_id == entry.session_id # same session preserved
# ---------------------------------------------------------------------------
# Clean shutdown marker integration
# ---------------------------------------------------------------------------
class TestCleanShutdownMarker:
"""Test that the marker file controls session suspension on startup."""
def test_marker_written_on_graceful_stop(self, tmp_path, monkeypatch):
"""stop() should write .clean_shutdown marker."""
monkeypatch.setattr("gateway.run._hermes_home", tmp_path)
marker = tmp_path / ".clean_shutdown"
assert not marker.exists()
# Create a minimal runner and call the shutdown logic directly
from gateway.run import GatewayRunner
runner = object.__new__(GatewayRunner)
runner._restart_requested = False
runner._restart_detached = False
runner._restart_via_service = False
runner._restart_task_started = False
runner._running = True
runner._draining = False
runner._stop_task = None
runner._running_agents = {}
runner._pending_messages = {}
runner._pending_approvals = {}
runner._background_tasks = set()
runner._shutdown_event = MagicMock()
runner._restart_drain_timeout = 5
runner._exit_code = None
runner._exit_reason = None
runner.adapters = {}
runner.config = GatewayConfig()
# Mock heavy dependencies
with patch("gateway.run.GatewayRunner._drain_active_agents", new_callable=AsyncMock, return_value=([], False)), \
patch("gateway.run.GatewayRunner._finalize_shutdown_agents"), \
patch("gateway.run.GatewayRunner._update_runtime_status"), \
patch("gateway.status.remove_pid_file"), \
patch("tools.process_registry.process_registry") as mock_proc_reg, \
patch("tools.terminal_tool.cleanup_all_environments"), \
patch("tools.browser_tool.cleanup_all_browsers"):
mock_proc_reg.kill_all = MagicMock()
import asyncio
asyncio.get_event_loop().run_until_complete(runner.stop())
assert marker.exists(), ".clean_shutdown marker should exist after graceful stop"
def test_no_marker_triggers_suspension(self, tmp_path, monkeypatch):
"""Without .clean_shutdown marker (crash), suspension should fire."""
monkeypatch.setattr("gateway.run._hermes_home", tmp_path)
marker = tmp_path / ".clean_shutdown"
assert not marker.exists()
# Create a store with a recently active session
store = _make_store(tmp_path)
source = _make_source()
entry = store.get_or_create_session(source)
assert not entry.suspended
# Simulate what start() does:
if marker.exists():
marker.unlink()
else:
store.suspend_recently_active()
# Session SHOULD be resume_pending (crash recovery preserves history)
with store._lock:
store._ensure_loaded_locked()
resume_count = sum(1 for e in store._entries.values() if e.resume_pending)
assert resume_count == 1, "Session should be resume_pending after crash (no marker)"
# ---------------------------------------------------------------------------
# resume_pending freshness gate (#46934)
# ---------------------------------------------------------------------------
class TestResumePendingFreshnessGate:
"""A resume_pending session is only returned while it is still fresh.
``get_or_create_session`` returns a ``resume_pending`` session so its
transcript reloads intact after a restart. But the idle/daily reset
policy keys on ``updated_at``, which is bumped to ``now`` on every
message — so a zombie session that keeps receiving messages never trips
it and would resume stale context forever. The freshness gate keys on
``last_resume_marked_at`` (set once at resume-mark, never bumped) so it
catches that case.
"""
def _mark_resume_pending(self, store, source):
"""Put the session into resume_pending and return the entry."""
store.get_or_create_session(source)
count = store.suspend_recently_active()
assert count == 1
with store._lock:
entry = store._entries[store._generate_session_key(source)]
assert entry.resume_pending
assert entry.last_resume_marked_at is not None
return entry
def test_stale_resume_pending_falls_through_to_reset(self, tmp_path, monkeypatch):
monkeypatch.setenv("HERMES_AUTO_CONTINUE_FRESHNESS", "3600")
# The freshness gate only applies when the user has opted into
# automatic resets — session_reset.mode: none disables it (#61052).
from gateway.config import SessionResetPolicy
store = _make_store(
tmp_path, policy=SessionResetPolicy(mode="idle", idle_minutes=999999)
)
source = _make_source()
entry = self._mark_resume_pending(store, source)
# Backdate the resume mark past the freshness window. Keep updated_at
# fresh (as a per-message zombie would have) so the idle/daily policy
# would NOT fire — only the freshness gate should catch this.
with store._lock:
entry.last_resume_marked_at = datetime.now() - timedelta(seconds=7200)
entry.updated_at = datetime.now()
store._save()
fresh = store.get_or_create_session(source)
# Zombie detected → brand-new session, not the stale transcript.
assert fresh.session_id != entry.session_id
assert not fresh.resume_pending
def test_reset_mode_none_disables_freshness_gate(self, tmp_path, monkeypatch):
"""session_reset.mode: none opts out of ALL automatic resets —
including the resume_pending freshness gate (#61052)."""
monkeypatch.setenv("HERMES_AUTO_CONTINUE_FRESHNESS", "3600")
from gateway.config import SessionResetPolicy
store = _make_store(tmp_path, policy=SessionResetPolicy(mode="none"))
source = _make_source()
entry = self._mark_resume_pending(store, source)
with store._lock:
entry.last_resume_marked_at = datetime.now() - timedelta(seconds=7200)
entry.updated_at = datetime.now()
store._save()
refreshed = store.get_or_create_session(source)
# Explicit opt-out honored: same session back, transcript preserved.
assert refreshed.session_id == entry.session_id
assert refreshed.resume_pending