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.
40 lines
1.5 KiB
Python
40 lines
1.5 KiB
Python
"""Session <-> workspace grouping key (hermes_state_sessions.workspace_key).
|
|
|
|
The key is what `hermes sessions list --workspace` groups/filters on. It is a
|
|
coarse workspace identity derived from fields already recorded on sessions
|
|
(git_repo_root, cwd) — no git shelling, no new columns. Branch is deliberately
|
|
NOT part of the key.
|
|
"""
|
|
|
|
import hermes_state_sessions
|
|
from hermes_state_sessions import workspace_key
|
|
|
|
|
|
def test_repo_root_is_the_key_when_known():
|
|
row = {"git_repo_root": "/www/app", "cwd": "/www/app/src", "git_branch": "feat"}
|
|
assert workspace_key(row) == "/www/app"
|
|
|
|
|
|
def test_falls_back_to_cwd_for_non_git_sessions():
|
|
assert workspace_key({"cwd": "/work/notes"}) == "/work/notes"
|
|
assert workspace_key({"git_repo_root": "", "cwd": "/work/notes"}) == "/work/notes"
|
|
|
|
|
|
def test_none_when_unbound():
|
|
assert workspace_key({}) is None
|
|
assert workspace_key({"cwd": "", "git_repo_root": ""}) is None
|
|
assert workspace_key({"cwd": " "}) is None
|
|
|
|
|
|
def test_branch_does_not_affect_the_key():
|
|
# Two sessions on the same repo, different branches, group together.
|
|
a = {"git_repo_root": "/www/app", "git_branch": "main"}
|
|
b = {"git_repo_root": "/www/app", "git_branch": "feature-x"}
|
|
assert workspace_key(a) == workspace_key(b) == "/www/app"
|
|
|
|
|
|
def test_repo_root_wins_over_a_differing_cwd():
|
|
# A worktree/subdir session still groups under its repo root, not its cwd.
|
|
row = {"git_repo_root": "/www/app", "cwd": "/www/app/.worktrees/x"}
|
|
assert workspace_key(row) == "/www/app"
|