Fix unit tests after conflicting PRs merged #8393
Merged
Conversation
This file contains 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
pracucci
commented
Jun 17, 2024
| validateClonedHeaders(t, r.GetHeaders(), newHeaders) | ||
| }) | ||
| t.Run("WithStartEnd", func(t *testing.T) { | ||
| r := originalReq.WithStartEnd(100, 200) | ||
| r, err := originalReq.WithStartEnd(100, 200) |
There was a problem hiding this comment.
Note to reviewers: this is the actual fix.
pracucci
commented
Jun 17, 2024
| @@ -134,12 +134,10 @@ func TestMetricQueryRequestCloneHeaders(t *testing.T) { | |||
| } | |||
|
|
|||
| r := originalReq.WithHeaders(newHeaders) | |||
| require.NoError(t, err) | |||
There was a problem hiding this comment.
Note to reviewers: removed such assertions because they're useless (the line above is not returning an error and err variable is already checked)
krajorama
reviewed
Jun 17, 2024
krajorama
approved these changes
Jun 17, 2024
Signed-off-by: Marco Pracucci <marco@pracucci.com>
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.
What this PR does
#8379 and #8392 were merged few seconds apart, and they had conflicting changes causing CI to fail. This PR fixes it.
Which issue(s) this PR fixes or relates to
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.