54ad8c7fd2
ece7c172f8refreshed .hermes-bootstrap-complete only from complete_source_checkout, but two other paths publish a new checkout identity through write_source_stamp without it: the PM updater's finish (update_finish.py, the path an old updater's handoff takes) and boot-time blessed-checkout adoption (post_update.py). The Windows E2E leg installer-script -> hermes-update (v2026.6.19 -> HEAD) takes the handoff, so it still failed "pinnedCommit2bd1977d8f!= installed HEAD ece7c172f8d8". The refresh now lives inside write_source_stamp, so every caller moves the receipt with the identity it publishes. The tests pin that seam (red onece7c172f8with the CI message, green here).
89 lines
3.9 KiB
Python
89 lines
3.9 KiB
Python
"""A source checkout publishes identity only after successful completion."""
|
|
|
|
import json
|
|
import os
|
|
from pathlib import Path
|
|
import subprocess
|
|
import sys
|
|
|
|
from hermes_cli.source_completion import complete_source_checkout
|
|
from hermes_cli.source_stamp import write_source_stamp
|
|
|
|
|
|
def _repo(tmp_path: Path) -> Path:
|
|
root = tmp_path / "repo"
|
|
root.mkdir()
|
|
env = {"HOME": str(tmp_path), "PATH": os.environ["PATH"]}
|
|
|
|
def git(*args: str) -> None:
|
|
subprocess.run(["git", *args], cwd=root, env=env, check=True, capture_output=True)
|
|
|
|
git("init", "-q")
|
|
git("config", "user.name", "Hermes Test")
|
|
git("config", "user.email", "hermes@example.invalid")
|
|
(root / "tracked").write_text("release\n", encoding="utf-8")
|
|
git("add", "tracked")
|
|
git("commit", "-qm", "release")
|
|
git("tag", "v0.21.4")
|
|
return root
|
|
|
|
|
|
def _completion_dependencies(monkeypatch, maintenance):
|
|
monkeypatch.setattr("hermes_cli.venv_sync.publish_launchers", lambda root: None)
|
|
monkeypatch.setattr("hermes_cli.source_build.build_update_products", lambda root, *, desktop: None)
|
|
monkeypatch.setattr("hermes_cli.update_cmd_maint._run_post_update_maintenance", maintenance)
|
|
|
|
|
|
def test_successful_source_completion_writes_checkout_identity(tmp_path, monkeypatch):
|
|
root = _repo(tmp_path)
|
|
|
|
def maintenance(**_kwargs):
|
|
assert not (root / "install-stamp.json").exists()
|
|
return True
|
|
|
|
_completion_dependencies(monkeypatch, maintenance)
|
|
|
|
assert complete_source_checkout(root, desktop=False, assume_yes=True)
|
|
assert (root / "install-stamp.json").is_file()
|
|
|
|
|
|
def test_failed_source_completion_does_not_publish_identity(tmp_path, monkeypatch):
|
|
root = _repo(tmp_path)
|
|
_completion_dependencies(monkeypatch, lambda **_kwargs: False)
|
|
|
|
assert not complete_source_checkout(root, desktop=False, assume_yes=True)
|
|
assert not (root / "install-stamp.json").exists()
|
|
|
|
|
|
def _verify_bootstrap_receipt(root: Path) -> subprocess.CompletedProcess:
|
|
"""The same verifier the Windows install/update E2E runs after an update."""
|
|
script = Path(__file__).resolve().parents[2] / "scripts" / "verify-bootstrap-version-stamp.py"
|
|
return subprocess.run([sys.executable, "-B", str(script), "--stamp", str(root / ".hermes-bootstrap-complete"),
|
|
"--repo", str(root)], capture_output=True, text=True, encoding="utf-8")
|
|
|
|
|
|
def test_publishing_checkout_identity_moves_an_installer_receipt_to_head(tmp_path):
|
|
# write_source_stamp is the one seam: the completion handoff, the PM updater's finish and
|
|
# boot-time adoption all publish identity through it, and the receipt must follow every one.
|
|
root = _repo(tmp_path)
|
|
release = subprocess.run(["git", "rev-parse", "HEAD"], cwd=root, capture_output=True, text=True, check=True).stdout.strip()
|
|
branch = subprocess.run(["git", "branch", "--show-current"], cwd=root, capture_output=True, text=True, check=True).stdout.strip()
|
|
# What install.sh / install.ps1's complete stage leaves behind at the installed release.
|
|
(root / ".hermes-bootstrap-complete").write_text(json.dumps({
|
|
"schemaVersion": 1, "pinnedCommit": release, "pinnedBranch": branch, "completedAt": "2026-06-19T00:00:00.000Z",
|
|
}), encoding="utf-8")
|
|
subprocess.run(["git", "commit", "-q", "--allow-empty", "-m", "update"], cwd=root, check=True, capture_output=True,
|
|
env={**os.environ, "GIT_AUTHOR_NAME": "t", "GIT_AUTHOR_EMAIL": "t@example.invalid",
|
|
"GIT_COMMITTER_NAME": "t", "GIT_COMMITTER_EMAIL": "t@example.invalid"})
|
|
assert write_source_stamp(root) is not None
|
|
result = _verify_bootstrap_receipt(root)
|
|
assert result.returncode == 0, result.stdout + result.stderr
|
|
|
|
|
|
def test_publishing_checkout_identity_never_invents_an_installer_receipt(tmp_path):
|
|
# The receipt's presence is what marks a script install; a manual clone stays one.
|
|
root = _repo(tmp_path)
|
|
|
|
assert write_source_stamp(root) is not None
|
|
assert not (root / ".hermes-bootstrap-complete").exists()
|