Skip to content

test(engine): pin hazard-first merge refusal #821

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

Open
ahcrm-core wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test(engine): pin hazard-first merge refusal #821

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
4 changes: 3 additions & 1 deletion tests/test_engine_worktree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5827,11 +5827,13 @@ def test_merge_stray_dirt_escalates_with_clear_message(project):
# which is the exact verb (`unlink`) this guard performs on incoming strays.
assert "Unity" not in reason
assert "clean them" not in reason
assert "could commit under the story's name" in reason
assert "would fold them" not in reason
assert "Commit, stash or revert" in reason # the two SAFE resolutions, named
assert ".gitignore" in reason # the inner GitError still names the exact path
# The composed message says which half of the dirt actually blocks a merge. Note
# the inner GitError carries "tracked" too, so this one does not by itself pin the
# OUTER wording — "Commit, stash or revert" above is the assertion that does.
# OUTER wording — the hazard-first assertion above is the one that does.
assert "tracked" in reason
# branch kept for manual merge; the operator's edit was left untouched
assert branch_exists(project.project, "bmad-loop/test-run/1-1-a")
Expand Down