Modify Scenario Test to check tagged pull requests#5422
Merged
dkurepa merged 2 commits intodotnet:mainfrom Nov 4, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR enhances scenario tests to support merging pull requests instead of just closing them during cleanup, and adds validation for PR comments on closed PRs.
- Added
PullRequestCleanupOperationenum to toggle between closing and merging PRs - Extended
WaitForPullRequestAsyncandWaitForPullRequestCommentto filter PRs by state (open/closed) - Updated test to merge the PR and verify comments appear on the closed PR
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| test/ProductConstructionService.ScenarioTests/ScenarioTestBase.cs | Added PullRequestCleanupOperation enum, MergePullRequest method, and updated CleanUpPullRequestAfter to support merge operations; moved using statements to top of file |
| test/ProductConstructionService.ScenarioTests/CodeFlowScenarioTestBase.cs | Updated CheckForwardFlowGitHubPullRequest and WaitForPullRequestComment to accept PullRequestCleanupOperation and ItemStateFilter parameters respectively |
| test/ProductConstructionService.ScenarioTests/ScenarioTests/ScenarioTests_CodeFlow.cs | Modified test to use merge cleanup operation and verify comments on closed PR with corrected expected comment format |
Comments suppressed due to low confidence (2)
test/ProductConstructionService.ScenarioTests/ScenarioTestBase.cs:1252
- Generic catch clause.
catch
{
// Closed already
}
test/ProductConstructionService.ScenarioTests/ScenarioTestBase.cs:1260
- Generic catch clause.
catch
{
// branch already deleted
}
Comment on lines
+1249
to
+1252
| catch | ||
| { | ||
| // Closed already | ||
| } |
There was a problem hiding this comment.
Empty catch block swallows all exceptions without logging. This should catch specific exceptions (e.g., ApiException) and log or rethrow unexpected errors to aid debugging test failures.
Comment on lines
+107
to
+113
| // here we're testing for a URI with () around, since that's what we write during the codeflow udpates | ||
| [$"(https://github.com/maestro-auth-test/maestro-test1/pull/{testPrNumber})"]); | ||
|
|
||
| await WaitForPullRequestComment( | ||
| TestRepository.VmrTestRepoName, | ||
| targetBranchName, | ||
| // here we test for this specific format because that's how we tag PRs after merging the forward flow |
There was a problem hiding this comment.
The expected comment format wrapped in parentheses differs from the format on line 112 which uses - prefix. This inconsistency suggests these may be validating different comment formats. Consider adding a comment explaining why these two checks use different formats or consolidating if they should match.
Suggested change
| // here we're testing for a URI with () around, since that's what we write during the codeflow udpates | |
| [$"(https://github.com/maestro-auth-test/maestro-test1/pull/{testPrNumber})"]); | |
| await WaitForPullRequestComment( | |
| TestRepository.VmrTestRepoName, | |
| targetBranchName, | |
| // here we test for this specific format because that's how we tag PRs after merging the forward flow | |
| // We expect the URI to be wrapped in parentheses here because codeflow update comments use this format. | |
| // This matches the format written by the codeflow update logic, which intentionally differs from the merge tag format below. | |
| [$"(https://github.com/maestro-auth-test/maestro-test1/pull/{testPrNumber})"]); | |
| await WaitForPullRequestComment( | |
| TestRepository.VmrTestRepoName, | |
| targetBranchName, | |
| // We expect the '- ' prefix here because merged PRs are tagged with this format after forward flow completion. | |
| // This is distinct from the codeflow update format above, and is required for correct PR tracking. |
premun
approved these changes
Nov 3, 2025
dkurepa
added a commit
to dkurepa/arcade-services
that referenced
this pull request
Nov 12, 2025
…)" This reverts commit 96285f6.
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.
#5263