Skip to content

bpo-31177: Fix reset_mock on mock with deleted children #10807

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.

Sign up for GitHub

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

Closed
eli-b wants to merge 2 commits into from
Closed

bpo-31177: Fix reset_mock on mock with deleted children #10807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78c563c
Fix reset_mock on mock with deleted children
eli-b Nov 30, 2018
e6b5afe
Added a blurb
eli-b Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,9 @@ def reset_mock(self, visited=None,*, return_value=False, side_effect=False):
if side_effect:
self._mock_side_effect = None

# Forget that children were deleted
self._mock_children = {k: v for k, v in self._mock_children.items() if v is not _deleted}

for child in self._mock_children.values():
if isinstance(child, _SpecState):
continue
Expand Down
7 changes: 5 additions & 2 deletions Lib/unittest/test/testmock/testmock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,13 @@ def test_java_exception_side_effect(self):

def test_reset_mock(self):
parent = Mock()
spec = ["something"]
spec = ["something", "deleted"]
mock = Mock(name="child", parent=parent, spec=spec)
mock(sentinel.Something, something=sentinel.SomethingElse)
something = mock.something
mock.something()
mock.deleted
del mock.deleted
mock.side_effect = sentinel.SideEffect
return_value = mock.return_value
return_value()
Expand Down Expand Up @@ -234,10 +236,11 @@ def test_reset_mock(self):
self.assertEqual(mock.return_value, return_value,
"return_value incorrectly reset")
self.assertFalse(return_value.called, "return value mock not reset")
self.assertEqual(mock._mock_children, {'something': something},
self.assertEqual(list(mock._mock_children), ['something'],
"children reset incorrectly")
self.assertEqual(mock.something, something,
"children incorrectly cleared")
mock.deleted # available again
self.assertFalse(mock.something.called, "child not reset")


Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2018-11-30-03-23-06.bpo-31177.hp4sp9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
unittest.mock: reset_mock() now works on Mock objects that had attributes
deleted. The deletion of an attribute is now forgotten after a reset_mock()
call. Accessing the deleted attribute after a reset_mock() call behaves like
its first access.