test: inject conflicts into the random invariant model#82
Merged
Conversation
andyrewlee
force-pushed
the
audit/34-abort-into-engine
branch
from
df2d219 to
9ef69db
Compare
runModel's cases never call conflictOn, so every random restack took the clean path -- ErrConflict/PendingReparent/Continue were unreachable in the random walk (only the fixed 2-branch fixtures exercised them), so the model never explored op-after-op interactions around a just-resolved rebase. Add an 11th carve-out (like the repair/prune ones, outside the undo oracle): with low probability pick a non-trunk-parented branch, conflictOn it, amend its parent to trigger the upstack conflict, assert ErrConflict + rebase-in-progress, Continue, then assert the restack is idempotent and invariants hold. The resolved state flows into the later walk for free. Stable across seeds (-count=6).
andyrewlee
force-pushed
the
audit/35-model-inject-conflicts
branch
from
1722238 to
61aba0f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
runModel's cases never call conflictOn, so every random restack took the clean
path -- ErrConflict/PendingReparent/Continue were unreachable in the random walk
(only the fixed 2-branch fixtures exercised them), so the model never explored
op-after-op interactions around a just-resolved rebase. Add an 11th carve-out
(like the repair/prune ones, outside the undo oracle): with low probability pick
a non-trunk-parented branch, conflictOn it, amend its parent to trigger the
upstack conflict, assert ErrConflict + rebase-in-progress, Continue, then assert
the restack is idempotent and invariants hold. The resolved state flows into the
later walk for free. Stable across seeds (-count=6).
Part of a 38-PR stacked diff (
audit/01…audit/38), reviewed and merged bottom-up. This PR is based onaudit/34-abort-into-engine.