teknium1
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.
66 lines
2.2 KiB
Python
66 lines
2.2 KiB
Python
"""Regression test for #68053 — hub lock.json with Windows-1252 bytes.
|
|
|
|
`_read_hub_installed_names()` reads `~/.hermes/skills/.hub/lock.json` with a
|
|
strict UTF-8 decode. A hub skill description carrying a Windows-1252 typographic
|
|
byte (em-dash `0x97`, smart quotes, bullets) makes `read_text(encoding="utf-8")`
|
|
raise `UnicodeDecodeError` — a `ValueError` sibling that is NOT caught by the
|
|
function's `except (OSError, json.JSONDecodeError)`, so it escapes and returns
|
|
HTTP 500 from the entire `/api/skills` endpoint, blanking the desktop Skills
|
|
panel. The fix decodes with `errors="replace"`, so the offending byte degrades
|
|
to U+FFFD and every skill name in the (structurally valid) lock stays readable.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import importlib
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def skills_home(tmp_path, monkeypatch):
|
|
home = tmp_path / ".hermes"
|
|
home.mkdir()
|
|
(home / "skills").mkdir()
|
|
monkeypatch.setattr(Path, "home", lambda: tmp_path)
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
import tools.skill_usage as mod
|
|
importlib.reload(mod)
|
|
return home
|
|
|
|
|
|
def _write_hub_lock(home: Path, raw: bytes) -> None:
|
|
hub_dir = home / "skills" / ".hub"
|
|
hub_dir.mkdir(parents=True, exist_ok=True)
|
|
(hub_dir / "lock.json").write_bytes(raw)
|
|
|
|
|
|
def test_windows_1252_em_dash_does_not_raise(skills_home):
|
|
"""A 0x97 em-dash byte in a description must not blow up the reader."""
|
|
import tools.skill_usage as mod
|
|
|
|
# Valid JSON structure, but the description value contains a raw cp1252
|
|
# em-dash byte (0x97) instead of the UTF-8 sequence.
|
|
raw = (
|
|
b'{"installed": {"supply-chain": '
|
|
b'{"description": "guidance: safe \x97 3 finding(s)"}}}'
|
|
)
|
|
_write_hub_lock(skills_home, raw)
|
|
|
|
names = mod._read_hub_installed_names()
|
|
|
|
# The skill name is still recovered; no UnicodeDecodeError / 500.
|
|
assert "supply-chain" in names
|
|
|
|
|
|
def test_clean_utf8_lock_still_read(skills_home):
|
|
"""A well-formed UTF-8 lock keeps working unchanged."""
|
|
import tools.skill_usage as mod
|
|
|
|
raw = '{"installed": {"alpha": {}, "beta": {}}}'.encode("utf-8")
|
|
_write_hub_lock(skills_home, raw)
|
|
|
|
names = mod._read_hub_installed_names()
|
|
|
|
assert {"alpha", "beta"} <= names
|