-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(suite) correctly set stats on test panic #1195
Merged
boyan-soubachov
merged 1 commit into
stretchr:master
from
nicoche:suite-fix-stats-on-panic
Jun 23, 2022
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't this break the
recover()
infailOnPanic(t)
that gets called later?IIRC
defer
s are stored in a stack, so this function would be executed first and executing thisrecover()
without 're-panic
ing' would break the subsequent,failOnPanic
function?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good remark.
First,
failOnPanic(t)
is a no-op if it is called in a context where it does not panic.Then, you are right: in case a test panics, this function takes precedence over the
failOnPanic(t)
L139 andfailOnPanic(t)
will be a no-op. But I added the body offailOnpanic(t)
L157:L162, so this way, we don't change the current behavior:We can define a subfunction for those two lines if needed.
Note that the
failOnPanic(t)
is still relevant because the current function may panic. That is because it may run user code viaAfterTest()
orTearDownTestSuite()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to refactor said
failOnPanic()
body (L159 - L160) out into a common function that can then be called from here andfailOnPanic()
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. I renamed
failOnPanic(t)
torecoverAndFailOnPanic(t)
and called the common functionfailOnPanic(t, r)