fix flakey tests #35
Merged
fix flakey tests #35
+18
−40
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR refactors branchMatchesCriteria to take its filter parameters explicitly rather than relying on mutable globals, updating all call sites and tests accordingly to avoid race conditions in parallel tests.
- Changed the signature of
branchMatchesCriteriato acceptcombineBranchName,branchPrefix,branchSuffix, andbranchRegexas parameters. - Updated
PrMatchesCriteriato pass through the global values to the new signature. - Revised
TestBranchMatchesCriteriato remove global state manipulation and call the refactored function with per-test inputs.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| internal/cmd/match_criteria_test.go | Removed global setup/teardown, added parameters to test calls |
| internal/cmd/match_criteria.go | Updated function signature and its call in PrMatchesCriteria |
nobe4
reviewed
May 9, 2025
nobe4
previously approved these changes
May 9, 2025
nobe4
approved these changes
May 9, 2025
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.
The
TestBranchMatchesCriteriafunction uses global variables (combineBranchName,branchPrefix,branchSuffix,branchRegex) that are modified during each test case. This can lead to race conditions and flakiness when tests are run in parallel. The fix is to refactor thebranchMatchesCriteriafunction to accept these variables as parameters instead of relying on global state.resolves: #34