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.
68 lines
2.4 KiB
Python
68 lines
2.4 KiB
Python
"""Regression: installer/bootstrap must recover from diverged managed clones.
|
|
|
|
When ``~/.hermes/hermes-agent`` has local-only commits (or diverged history),
|
|
``git pull --ff-only`` fails with exit 128 and bootstrap aborts at the
|
|
repository stage. ``hermes update`` already resets to ``origin/$BRANCH`` in
|
|
that case; both installer scripts must do the same.
|
|
|
|
Fixes the bootstrap failure seen in #53257 and desktop update paths that run
|
|
``install.ps1`` / ``install.sh`` non-interactively.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from pathlib import Path
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent
|
|
INSTALL_SH = REPO_ROOT / "scripts" / "install.sh"
|
|
INSTALL_PS1 = REPO_ROOT / "scripts" / "install.ps1"
|
|
|
|
|
|
def _extract_install_sh_update_block() -> str:
|
|
text = INSTALL_SH.read_text()
|
|
match = re.search(
|
|
r"(?P<block>git checkout \"\$BRANCH\".*?fi\n\n if \[ -n \"\$autostash_ref\" \])",
|
|
text,
|
|
re.DOTALL,
|
|
)
|
|
assert match is not None, "managed-install update block not found in install.sh"
|
|
return match["block"]
|
|
|
|
|
|
def _extract_install_ps1_branch_update_block() -> str:
|
|
text = INSTALL_PS1.read_text()
|
|
match = re.search(
|
|
r"(?P<block>git -c windows\.appendAtomically=false checkout \$Branch.*?elseif \(\$Tag\))",
|
|
text,
|
|
re.DOTALL,
|
|
)
|
|
assert match is not None, "branch update block not found in install.ps1"
|
|
return match["block"]
|
|
|
|
|
|
def test_install_sh_resets_when_ff_only_pull_fails() -> None:
|
|
block = _extract_install_sh_update_block()
|
|
|
|
assert 'git pull --ff-only origin "$BRANCH"' in block
|
|
assert 'git reset --hard "origin/$BRANCH"' in block
|
|
assert "Fast-forward not possible" in block
|
|
|
|
pull_idx = block.find('git pull --ff-only origin "$BRANCH"')
|
|
reset_idx = block.find('git reset --hard "origin/$BRANCH"')
|
|
assert pull_idx != -1 and reset_idx != -1
|
|
assert pull_idx < reset_idx, "ff-only pull must be attempted before reset fallback"
|
|
|
|
|
|
def test_install_ps1_resets_when_ff_only_pull_fails() -> None:
|
|
block = _extract_install_ps1_branch_update_block()
|
|
|
|
assert "pull --ff-only origin $Branch" in block
|
|
assert 'reset --hard "origin/$Branch"' in block
|
|
assert "Fast-forward not possible" in block
|
|
|
|
pull_idx = block.find("pull --ff-only origin $Branch")
|
|
reset_idx = block.find('reset --hard "origin/$Branch"')
|
|
assert pull_idx != -1 and reset_idx != -1
|
|
assert pull_idx < reset_idx, "ff-only pull must be attempted before reset fallback"
|