summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorXtreak <tirkarthi@users.noreply.github.com>2018-12-01 10:03:54 (GMT)
committerVictor Stinner <vstinner@redhat.com>2018-12-01 10:03:54 (GMT)
commitedeca92c84a3b08902ecdfe987cde00c7e617887 (patch)
tree965902be00aa84c99d0e7d7a0128c0625c7721d9 /Lib/unittest
parent989052047eea7f35da0d7ca268791b2442ee1553 (diff)
downloadcpython-edeca92c84a3b08902ecdfe987cde00c7e617887.zip
cpython-edeca92c84a3b08902ecdfe987cde00c7e617887.tar.gz
cpython-edeca92c84a3b08902ecdfe987cde00c7e617887.tar.bz2
bpo-31177: Skip deleted attributes while calling reset_mock (GH-9302)
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/mock.py2
-rw-r--r--Lib/unittest/test/testmock/testmock.py10
2 files changed, 11 insertions, 1 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index a9c82dc..9547b1a 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -542,7 +542,7 @@ class NonCallableMock(Base):
self._mock_side_effect = None
for child in self._mock_children.values():
- if isinstance(child, _SpecState):
+ if isinstance(child, _SpecState) or child is _deleted:
continue
child.reset_mock(visited)
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 8cd284a..ac6eea3 100644
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -1596,6 +1596,16 @@ class MockTest(unittest.TestCase):
self.assertRaises(AttributeError, getattr, mock, 'f')
+ def test_reset_mock_does_not_raise_on_attr_deletion(self):
+ # bpo-31177: reset_mock should not raise AttributeError when attributes
+ # were deleted in a mock instance
+ mock = Mock()
+ mock.child = True
+ del mock.child
+ mock.reset_mock()
+ self.assertFalse(hasattr(mock, 'child'))
+
+
def test_class_assignable(self):
for mock in Mock(), MagicMock():
self.assertNotIsInstance(mock, int)