bpo-38932: Mock fully resets child objects on reset_mock(). (GH-17409)
This commit is contained in:
parent
9bfb4a7061
commit
aef7dc8987
|
@ -592,7 +592,7 @@ class NonCallableMock(Base):
|
|||
for child in self._mock_children.values():
|
||||
if isinstance(child, _SpecState) or child is _deleted:
|
||||
continue
|
||||
child.reset_mock(visited)
|
||||
child.reset_mock(visited, return_value=return_value, side_effect=side_effect)
|
||||
|
||||
ret = self._mock_return_value
|
||||
if _is_instance_mock(ret) and ret is not self:
|
||||
|
|
|
@ -1636,11 +1636,23 @@ class MockTest(unittest.TestCase):
|
|||
self.assertNotEqual(m.side_effect, None)
|
||||
|
||||
def test_reset_sideeffect(self):
|
||||
m = Mock(return_value=10, side_effect=[2,3])
|
||||
m = Mock(return_value=10, side_effect=[2, 3])
|
||||
m.reset_mock(side_effect=True)
|
||||
self.assertEqual(m.return_value, 10)
|
||||
self.assertEqual(m.side_effect, None)
|
||||
|
||||
def test_reset_return_with_children(self):
|
||||
m = MagicMock(f=MagicMock(return_value=1))
|
||||
self.assertEqual(m.f(), 1)
|
||||
m.reset_mock(return_value=True)
|
||||
self.assertNotEqual(m.f(), 1)
|
||||
|
||||
def test_reset_return_with_children_side_effect(self):
|
||||
m = MagicMock(f=MagicMock(side_effect=[2, 3]))
|
||||
self.assertNotEqual(m.f.side_effect, None)
|
||||
m.reset_mock(side_effect=True)
|
||||
self.assertEqual(m.f.side_effect, None)
|
||||
|
||||
def test_mock_add_spec(self):
|
||||
class _One(object):
|
||||
one = 1
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Mock fully resets child objects on reset_mock(). Patch by Vegard Stikbakke
|
Loading…
Reference in New Issue