bpo-40126: Fix reverting multiple patches in unittest.mock. #19351
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
Patcher's __exit__() is now never called if its __enter__() is failed. Returning true from __exit__() silences now the exception.
serhiy-storchaka added type-bug 
Member Author
| Maybe ExitStack could be used here. |
tirkarthi reviewed Apr 4, 2020
Lib/unittest/mock.py Outdated
| patcher.__exit__(*exc_info) | ||
| exit_stack = self._exit_stack | ||
| del self._exit_stack | ||
| return exit_stack.__exit__(*sys.exc_info()) |
Member
There was a problem hiding this comment.
Should this be passing exc_info parameter passed to __exit__? Is there a case where exc_info can be different from sys.exc_info?
Member Author
There was a problem hiding this comment.
Good catch! Thank you.
serhiy-storchaka commented Apr 4, 2020
Lib/unittest/mock.py Outdated
| patcher.__exit__(*exc_info) | ||
| exit_stack = self._exit_stack | ||
| del self._exit_stack | ||
| return exit_stack.__exit__(*sys.exc_info()) |
Member Author
There was a problem hiding this comment.
Good catch! Thank you.
Contributor
| Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8. |
Contributor
| Sorry, @serhiy-storchaka, I could not cleanly backport this to |
Contributor
| Sorry @serhiy-storchaka, I had trouble checking out the |
Member
| Thanks for the refactor. Can these cases be tested to catch them in future? |
Contributor
| @serhiy-storchaka - I have to be honest, bit disappointed to see changes like these going in without unit tests to verify their behaviour. Would you be able to put in another PR to add these tests? |
Member Author
| I agree with you, but it is very hard to write any realistic tests for subtle behavior changes caused by this PR. I'll try more, but I don't have any tests yet. At least the code looks now clearer and the existing tests are passed. |
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Apr 12, 2020
…thonGH-19351) Patcher's __exit__() is now never called if its __enter__() is failed. Returning true from __exit__() silences now the exception.. (cherry picked from commit 4b222c9) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
| GH-19483 is a backport of this pull request to the 3.8 branch. |
| GH-19484 is a backport of this pull request to the 3.7 branch. |
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Apr 12, 2020
…thonGH-19351) Patcher's __exit__() is now never called if its __enter__() is failed. Returning true from __exit__() silences now the exception.. (cherry picked from commit 4b222c9) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
|
Contributor
| @serhiy-storchaka - what is the case that is difficult to test? I've had a quick scan of the issue, and neither the original bug report, around something attempting to clear patchings (just have the unit test to the same thing), nor your observation that |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
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.
Patcher's
__exit__()is now never called if its__enter__()is failed.Returning true from
__exit__()silences now the exception.https://bugs.python.org/issue40126