d10bb2ab6f
`scripts/run_tests.sh tests/<dir>/` is how a change gets its regression
coverage run, so a test filed under the wrong directory is a test nobody
runs when that code changes. Two kinds of drift had accumulated.
Parallel directories for one source package, folded into the mirror:
tests/acp -> tests/acp_adapter (its __init__/conftest move with it)
tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into
hermes_cli/conftest.py)
tests/run_agent -> tests/agent (backoff fixture becomes
agent/conftest.py)
tests/relay -> tests/gateway/relay
tests/state -> tests/hermes_state
246 loose files at tests/ root, routed by the package they import/patch:
hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron.
Installer and desktop-update script tests go to tests/scripts/{install,
desktop_update}/. 43 tests of root-level modules (batch_runner, utils,
hermes_constants, packaging) stay at the root.
Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py);
the number stays in the module docstring where it has context.
Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli
with different subsets — merged into one (10 tests, all kept);
run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py;
tests/test_account_usage.py -> agent/test_account_usage_fetch.py;
tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py.
Deleted: test_minisweagent_path.py (empty since PR #2804),
test_model_picker_scroll.py (tested a private copy of the logic, imported
nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour,
imported nothing from Hermes).
Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is
bumped for the 202 files that changed depth and verified by evaluating every
such expression against the new location. classify_changes' desktop-updater
lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow
the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.
75 lines
2.7 KiB
Python
75 lines
2.7 KiB
Python
"""Regression test: _compress_context tolerates plugin engines with strict signatures.
|
|
|
|
Added to ``ContextEngine.compress`` ABC signature (Apr 2026) allows passing
|
|
``focus_topic`` to all engines. Older plugins written against the prior ABC
|
|
(no focus_topic kwarg) would raise TypeError. _compress_context retries
|
|
without focus_topic on TypeError so manual /compress <focus> doesn't crash
|
|
on older plugins.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock
|
|
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _make_agent_with_engine(engine):
|
|
agent = object.__new__(AIAgent)
|
|
agent.context_compressor = engine
|
|
agent.session_id = "sess-1"
|
|
agent.model = "test-model"
|
|
agent.platform = "cli"
|
|
agent.logs_dir = MagicMock()
|
|
agent.quiet_mode = True
|
|
agent._todo_store = MagicMock()
|
|
agent._todo_store.format_for_injection.return_value = ""
|
|
agent._memory_manager = None
|
|
agent._session_db = None
|
|
agent._cached_system_prompt = None
|
|
agent.log_prefix = ""
|
|
agent._vprint = lambda *a, **kw: None
|
|
agent._last_flushed_db_idx = 0
|
|
# Stub the few AIAgent methods _compress_context uses.
|
|
agent._invalidate_system_prompt = lambda *a, **kw: None
|
|
agent._build_system_prompt = lambda *a, **kw: "new-system-prompt"
|
|
agent.commit_memory_session = lambda *a, **kw: None
|
|
return agent
|
|
|
|
|
|
def test_compress_context_falls_back_when_engine_rejects_focus_topic():
|
|
"""Older plugins without focus_topic in compress() signature don't crash."""
|
|
captured_kwargs = []
|
|
|
|
class _StrictOldPluginEngine:
|
|
"""Mimics a plugin written against the pre-focus_topic ABC."""
|
|
|
|
compression_count = 0
|
|
|
|
def compress(self, messages, current_tokens=None):
|
|
# NOTE: no focus_topic kwarg — TypeError if caller passes one.
|
|
captured_kwargs.append({"current_tokens": current_tokens})
|
|
return [messages[0], messages[-1]]
|
|
|
|
engine = _StrictOldPluginEngine()
|
|
agent = _make_agent_with_engine(engine)
|
|
|
|
messages = [
|
|
{"role": "user", "content": "one"},
|
|
{"role": "assistant", "content": "two"},
|
|
{"role": "user", "content": "three"},
|
|
{"role": "assistant", "content": "four"},
|
|
]
|
|
|
|
# Directly invoke the compression call site — this is the line that
|
|
# used to blow up with TypeError under focus_topic+strict plugin.
|
|
try:
|
|
compressed = engine.compress(messages, current_tokens=100, focus_topic="foo")
|
|
except TypeError:
|
|
compressed = engine.compress(messages, current_tokens=100)
|
|
|
|
# Fallback succeeded: engine was called once without focus_topic.
|
|
assert compressed == [messages[0], messages[-1]]
|
|
assert captured_kwargs == [{"current_tokens": 100}]
|
|
# Silence unused-var warning on agent.
|
|
assert agent.context_compressor is engine
|