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.
47 lines
1.9 KiB
Python
47 lines
1.9 KiB
Python
"""The plugin-compat layer tells plugin authors where a name went, once, and internal code never trips it.
|
|
|
|
Kept alongside the compat layer (tests/hermes_cli/test_compat_manifest_targets.py); both are deleted with it.
|
|
"""
|
|
import importlib
|
|
import json
|
|
import warnings
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
ROOT = Path(__file__).resolve().parent.parent.parent
|
|
MANIFEST = ROOT / "compat_manifest.json"
|
|
pytestmark = pytest.mark.skipif(not MANIFEST.exists(), reason="compat layer removed (scheduled revert)")
|
|
|
|
|
|
def _a_lazy_entry():
|
|
entries = json.loads(MANIFEST.read_text())["entries"]
|
|
e = next(x for x in entries if x["kind"] == "moved-lazy" and x["facade"] == "tools.web_tools")
|
|
return e["facade"], e["name"]
|
|
|
|
|
|
def test_compat_resolution_warns_once_per_name_with_the_new_location():
|
|
from hermes_cli.plugin_compat import HermesPluginCompatWarning, _seen
|
|
facade, name = _a_lazy_entry()
|
|
_seen.discard((facade, name))
|
|
mod = importlib.import_module(facade)
|
|
with warnings.catch_warnings(record=True) as rec:
|
|
warnings.simplefilter("always")
|
|
getattr(mod, name)
|
|
getattr(mod, name)
|
|
ours = [w for w in rec if issubclass(w.category, HermesPluginCompatWarning)]
|
|
assert len(ours) == 1, [str(w.message) for w in rec]
|
|
msg = str(ours[0].message)
|
|
assert f"`{facade}.{name}` moved to `" in msg and "removed on 2026-09-14" in msg
|
|
|
|
|
|
def test_importing_the_facade_itself_does_not_warn():
|
|
"""Only RESOLVING a compat name warns; plugins that import the module for its live API stay silent."""
|
|
from hermes_cli.plugin_compat import HermesPluginCompatWarning
|
|
import sys
|
|
sys.modules.pop("tools.web_tools", None)
|
|
with warnings.catch_warnings(record=True) as rec:
|
|
warnings.simplefilter("always")
|
|
importlib.import_module("tools.web_tools")
|
|
assert not [w for w in rec if issubclass(w.category, HermesPluginCompatWarning)]
|