Fix cleanup functions not being invoked on test failures #7151
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
RonnyPfannschmidt
approved these changes
May 1, 2020
nicoddemus
commented
May 1, 2020
| @@ -537,28 +537,24 @@ def f(_): | |||
| ) | |||
| result.stdout.fnmatch_lines( | |||
| [ | |||
| "test_trial_error.py::TC::test_four SKIPPED", | |||
| "test_trial_error.py::TC::test_four FAILED", | |||
There was a problem hiding this comment.
This reverts the test to the state before 04f27d4, which introduced the breaking change about addCleanup not being called properly for failed tests.
nicoddemus
force-pushed
the
unittest-cleanup-6947
branch
from
a8e13e1
to
a50fe4a
Compare
nicoddemus
added
the
needs backport
nicoddemus
force-pushed
the
unittest-cleanup-6947
branch
2 times, most recently
from
20ac646
to
e244e32
Compare
nicoddemus
commented
May 2, 2020
|
|
||
| # let the unittest framework handle async functions | ||
| if is_async_function(self.obj): | ||
| self._testcase(self) | ||
| else: | ||
| setattr(self._testcase, self._testcase._testMethodName, wrapped_testMethod) | ||
| # when --pdb is given, we want to postpone calling tearDown() otherwise |
There was a problem hiding this comment.
Can you please review this bit @RonnyPfannschmidt? I noticed this was needed after one of the tests failed.
There was a problem hiding this comment.
i'm actually YOLO on that one, my insight to the implementation of unittest is limited
RonnyPfannschmidt
approved these changes
May 2, 2020
|
|
||
| # let the unittest framework handle async functions | ||
| if is_async_function(self.obj): | ||
| self._testcase(self) | ||
| else: | ||
| setattr(self._testcase, self._testcase._testMethodName, wrapped_testMethod) | ||
| # when --pdb is given, we want to postpone calling tearDown() otherwise |
There was a problem hiding this comment.
i'm actually YOLO on that one, my insight to the implementation of unittest is limited
Also delay calling tearDown() when --pdb is given, so users still have access to the instance variables (which are usually cleaned up during tearDown()) when debugging. Fix pytest-dev#6947
This reverts the test to the state before 04f27d4, which introduced the breaking change about addCleanup not being called properly for failed tests.
nicoddemus
force-pushed
the
unittest-cleanup-6947
branch
from
e244e32
to
82f584b
Compare
|
Thanks @RonnyPfannschmidt! |
nicoddemus
added a commit
to nicoddemus/pytest
that referenced
this pull request
May 2, 2020
nicoddemus
added
backported
This was referenced May 2, 2020
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.
Fix #6947