Stabilize non-fast-forward fallback tests in push_to_pull_request_branch (CJS shard 4)#35689
Merged
Conversation
Co-authored-by: gh-aw-bot <259018956+gh-aw-bot@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix JS Tests shard 4 failing on every push
Stabilize non-fast-forward fallback tests in May 29, 2026
push_to_pull_request_branch (CJS shard 4)
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
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.
JS Tests (shard 4/4)was red on every push/PR due to two regressions inpush_to_pull_request_branch.test.cjsaround non-fast-forward handling. The failures came from brittle ordered mocks that no longer matched the expanded git call sequence inpushSignedCommits.### Root cause captured in tests
mockResolvedValueOnceorder forexec.getExecOutput.rev-parse,rev-list --parents,diff-tree), shifting those assumptions and invalidating assertions.### Test harness updated (minimal scope)
mockResolvedValueOncechains in the two failing cases with command-shape-basedmockImplementation.fallback_as_pull_request: falsereturnspush_failedand does not create fallback PR### Behavior preserved