Add rebase scenario tests#5429
Merged
premun merged 22 commits intodotnet:mainfrom Nov 4, 2025
Merged
Conversation
adamzip
previously approved these changes
Nov 4, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR adds two new scenario tests for codeflow rebase functionality and includes related refactoring and improvements across the codebase. The changes test forward and backward flow with rebase strategy when conflicts occur, while also making logging adjustments and cleanup.
- Adds comprehensive scenario tests for forward/backward flow with rebase strategy and conflict resolution
- Enables missing commit logic in PCS forward/backward flowers when rebase is enabled
- Improves clone manager to support local VMR registration and lookup
- Reduces logging verbosity by converting several Information logs to Debug level
Reviewed Changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| ScenarioTests_CodeFlowRebase.cs | Adds new scenario tests for forward/backward flow with rebase and conflict resolution |
| ScenarioTests_CodeFlow.cs | Removes unused VirtualMonoRepo import |
| ScenarioTestBase.cs | Adds logging, simplifies CheckoutRemoteRefAsync, removes unused methods, adds waitTime parameter |
| CodeFlowScenarioTestBase.cs | Removes unused batchable parameter and adds standard-automerge flag |
| PullRequestUpdater.cs | Fixes comment typo, adds whitespace, adds check result deletion logic |
| PcsVmrForwardFlower.cs | Overrides MergeWorkBranchAsync to commit when rebase is enabled |
| PcsVmrBackFlower.cs | Overrides MergeWorkBranchAsync to commit when rebase is enabled |
| VmrPatchHandler.cs | Changes logging from Information to Debug level |
| VmrManagerBase.cs | Changes commit logging from Information to Debug level |
| VmrCodeflower.cs | Makes MergeWorkBranchAsync virtual for override support |
| VmrCloneManager.cs | Refactors PrepareVmrAsync to support registered clone paths |
| CredScanSuppressionsGenerator.cs | Changes logging from Information to Debug level |
| CloneManager.cs | Makes _clones dictionary protected for subclass access |
| VmrOperationBase.cs | Changes conflict logging from Information to Warning level |
| ForwardFlowOperation.cs | Adds using statement, initializes VmrPath, registers VMR, uses remote URI |
Comments suppressed due to low confidence (3)
test/ProductConstructionService.ScenarioTests/ScenarioTests/ScenarioTests_CodeFlowRebase.cs:338
- Poor error handling: empty catch block.
catch
{
}
test/ProductConstructionService.ScenarioTests/ScenarioTests/ScenarioTests_CodeFlowRebase.cs:94
- Poor error handling: empty catch block.
catch {}
test/ProductConstructionService.ScenarioTests/ScenarioTests/ScenarioTests_CodeFlowRebase.cs:246
- Poor error handling: empty catch block.
catch {}
adamzip
previously approved these changes
Nov 4, 2025
# Conflicts: # src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrCloneManager.cs
adamzip
approved these changes
Nov 4, 2025
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.
#5362