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.
71 lines
2.6 KiB
Python
71 lines
2.6 KiB
Python
"""Invariant tests for the opt-in git-branch status-bar field."""
|
|
|
|
from datetime import datetime, timedelta
|
|
|
|
from cli import HermesCLI
|
|
from hermes_cli import status_bar_git
|
|
from hermes_cli.status_bar_git import current_git_branch
|
|
|
|
|
|
def _make_cli():
|
|
cli_obj = HermesCLI.__new__(HermesCLI)
|
|
cli_obj.model = "anthropic/claude-sonnet-4-20250514"
|
|
cli_obj.session_start = datetime.now() - timedelta(minutes=3)
|
|
cli_obj.conversation_history = [{"role": "user", "content": "hi"}]
|
|
cli_obj.agent = None
|
|
return cli_obj
|
|
|
|
|
|
def test_current_git_branch_reads_head_and_worktree_pointer(tmp_path):
|
|
"""Branch resolves from .git/HEAD in a plain repo AND through a gitdir: pointer
|
|
(worktree layout); a non-repo dir yields ''."""
|
|
repo = tmp_path / "repo"
|
|
(repo / ".git").mkdir(parents=True)
|
|
(repo / ".git" / "HEAD").write_text("ref: refs/heads/minimax-inspired/status-bar-git-branch\n")
|
|
status_bar_git._cache.clear()
|
|
assert current_git_branch(str(repo)) == "minimax-inspired/status-bar-git-branch"
|
|
|
|
# Worktree: .git is a file pointing at a private git dir with its own HEAD.
|
|
private = tmp_path / "gitdir-store"
|
|
private.mkdir()
|
|
(private / "HEAD").write_text("ref: refs/heads/feature-x\n")
|
|
wt = tmp_path / "wt"
|
|
wt.mkdir()
|
|
(wt / ".git").write_text(f"gitdir: {private}\n")
|
|
status_bar_git._cache.clear()
|
|
assert current_git_branch(str(wt)) == "feature-x"
|
|
|
|
plain = tmp_path / "plain"
|
|
plain.mkdir()
|
|
status_bar_git._cache.clear()
|
|
assert current_git_branch(str(plain)) == ""
|
|
|
|
|
|
def test_git_branch_segment_is_opt_in(monkeypatch, tmp_path):
|
|
"""The ⎇ segment renders only when 'git_branch' is in the configured field list —
|
|
default field set (None) never probes or shows it."""
|
|
repo = tmp_path / "repo"
|
|
(repo / ".git").mkdir(parents=True)
|
|
(repo / ".git" / "HEAD").write_text("ref: refs/heads/main\n")
|
|
monkeypatch.chdir(repo)
|
|
status_bar_git._cache.clear()
|
|
|
|
cli_obj = _make_cli()
|
|
cli_obj._status_bar_field_set_cache = None # default set
|
|
snapshot = cli_obj._get_status_bar_snapshot()
|
|
assert snapshot["git_branch"] == ""
|
|
text = "".join(
|
|
t for seg in cli_obj._status_bar_segments(
|
|
snapshot, 120, None, False, styled=False) for _, t in seg)
|
|
assert "⎇" not in text
|
|
|
|
cli_obj2 = _make_cli()
|
|
fields = frozenset({"model", "git_branch"})
|
|
cli_obj2._status_bar_field_set_cache = fields
|
|
snapshot2 = cli_obj2._get_status_bar_snapshot()
|
|
assert snapshot2["git_branch"] == "main"
|
|
text2 = "".join(
|
|
t for seg in cli_obj2._status_bar_segments(
|
|
snapshot2, 120, fields, False, styled=False) for _, t in seg)
|
|
assert "⎇ main" in text2
|