Skip to content

tests/test_ruleset_hint_tracking_branch.py: the re-run the hint offers is dated later than the first run, so a leg's seed made again, even in the same second, is another commit and fails "kept at its commit" where it passed by the clock (#922) #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettheap merged 1 commit into from
Oct 18, 2026
Merged

tests/test_ruleset_hint_tracking_branch.py: the re-run the hint offers is dated later than the first run, so a leg's seed made again, even in the same second, is another commit and fails "kept at its commit" where it passed by the clock (#922) #943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions tests/test_ruleset_hint_tracking_branch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@
the tracking branch was really refused;
* THE EXIT IT OFFERS IS TAKEN, with the ruleset off standing in for the
operator's bypass, and it FINISHES: the scaffold re-run pushes all three
repositories, a leg the first run had pushed kept at its commit; the
holder is pushed; the adoption verifies.
repositories, a leg the first run had pushed kept at its commit (the
re-run is dated later, so a seed it made again is another commit: #922);
the holder is pushed; the adoption verifies.

THE RULESET IS A `pre-receive` HOOK in each bare remote the tool makes, put
there by `GIT_TEMPLATE_DIR`, which every `git init` the tool runs honours. The
Expand Down Expand Up @@ -320,6 +321,15 @@ def probe(*args, cwd=root):
NEEDS_FILTER_REPO = ("adopt-extracted", "adopt-seeded")
SCAFFOLDED = (f"{PROJECT}.git", f"{PROJECT}-spec.git", f"{PROJECT}-code.git")

#: THE RE-RUN COMMITS LATER THAN THE FIRST RUN DID (#922). A commit made in the
#: same second as another, by the same identity, with the same message and
#: tree, IS that commit. So without a later date, a re-run that made a new seed
#: for a leg it should have kept, however fast, would push the object the leg
#: holds, and `tip(...) == before[repo]` below would pass by the clock. The
#: committer date is part of a commit's id, so it alone gives the new commit
#: another one; the author date need not move.
LATER = {"GIT_COMMITTER_DATE": "2031-01-01T00:00:00+0000"}


def run_the_tool(case: str, tracking: str, tmp_path, env: dict, work: Path,
*extra: str):
Expand Down Expand Up @@ -399,8 +409,8 @@ def test_the_hint_names_one_exit_and_taking_it_finishes_the_run(
before = {repo: tip(remotes / repo, tracking) for repo in SCAFFOLDED}

# THE EXIT, TAKEN: the ruleset off is the operator holding the bypass
# right, and the run is made again as the hint says.
operator = refusing(template)
# right, and the run is made again as the hint says, dated later (`LATER`).
operator = {**refusing(template), **LATER}
if case.startswith("scaffold") or case == "family":
again = run_the_tool(case, tracking, tmp_path, operator,
tmp_path / "again", "--reuse-empty-repo")
Expand All @@ -423,7 +433,8 @@ def test_the_hint_names_one_exit_and_taking_it_finishes_the_run(
assert "adoption verified" in again.stdout
return
# Every repository is pushed, each holds ONE commit, and a leg the first
# run had pushed is where that run left it: reused, never rewritten.
# run had pushed is where that run left it: reused, never rewritten. The
# re-run's date is later, so a seed it made again would be another id.
for repo in SCAFFOLDED:
assert tip(remotes / repo, tracking), repo
assert git("rev-list", "--count", "--all",
Expand Down
Loading