runtutil: add ExhaustCloseWithErrCapture #210
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
Code from https://github.com/thanos-io/thanos/blob/6d1b98d49781/pkg/runutil/, slightly modified for consistency. This enables grafana/e2e to build without a dependency on Thanos. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
|
|
2 tasks
56quarters
approved these changes
Aug 9, 2022
runutil/runutil_test.go
Outdated
| expectedErrStr: "2 errors: test; close: test", | ||
| }, | ||
| } { | ||
| if ok := t.Run("", func(t *testing.T) { |
There was a problem hiding this comment.
This seems like a really odd way to structure this test (I assume this is a verbatim copy of the Thanos tests?)
- Conditionals in the test body for the various test cases instead of having three separate tests ala
t.Run("something", ...) - Using
t.Failandt.Errorwhen we're already importing testify assert - Using
t.Run()with an empty test name?
runutil/runutil_test.go
Outdated
|
|
||
| CloseWithLogOnErr(lc, r, "should not be called") | ||
| CloseWithLogOnErr(lc, r, "should not be called") | ||
| assert.Equal(t, false, lc.WasCalled) |
There was a problem hiding this comment.
This can be replaced with assert.False or assert.True
pracucci
approved these changes
Aug 10, 2022
Use assert/require where possible. Supply a name to t.Run(). Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
|
I changed the tests as suggested by @56quarters. |
Thanks! |
56quarters
approved these changes
Aug 29, 2022
1 task
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.
Code from https://github.com/thanos-io/thanos/blob/6d1b98d49781/pkg/runutil/, slightly modified for consistency.
This enables grafana/e2e to build without a dependency on Thanos - grafana/e2e#4
Checklist
CHANGELOG.mdupdated