Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
edeca92c
Commit
edeca92c
authored
Dec 01, 2018
by
Xtreak
Committed by
Victor Stinner
Dec 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-31177: Skip deleted attributes while calling reset_mock (GH-9302)
parent
98905204
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
Lib/unittest/mock.py
Lib/unittest/mock.py
+1
-1
Lib/unittest/test/testmock/testmock.py
Lib/unittest/test/testmock/testmock.py
+10
-0
Misc/NEWS.d/next/Library/2018-09-14-10-38-18.bpo-31177.Sv91TN.rst
...S.d/next/Library/2018-09-14-10-38-18.bpo-31177.Sv91TN.rst
+2
-0
No files found.
Lib/unittest/mock.py
View file @
edeca92c
...
@@ -542,7 +542,7 @@ class NonCallableMock(Base):
...
@@ -542,7 +542,7 @@ class NonCallableMock(Base):
self
.
_mock_side_effect
=
None
self
.
_mock_side_effect
=
None
for
child
in
self
.
_mock_children
.
values
():
for
child
in
self
.
_mock_children
.
values
():
if
isinstance
(
child
,
_SpecState
):
if
isinstance
(
child
,
_SpecState
)
or
child
is
_deleted
:
continue
continue
child
.
reset_mock
(
visited
)
child
.
reset_mock
(
visited
)
...
...
Lib/unittest/test/testmock/testmock.py
View file @
edeca92c
...
@@ -1596,6 +1596,16 @@ class MockTest(unittest.TestCase):
...
@@ -1596,6 +1596,16 @@ class MockTest(unittest.TestCase):
self.assertRaises(AttributeError, getattr, mock, 'f')
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):
def test_class_assignable(self):
for mock in Mock(), MagicMock():
for mock in Mock(), MagicMock():
self.assertNotIsInstance(mock, int)
self.assertNotIsInstance(mock, int)
...
...
Misc/NEWS.d/next/Library/2018-09-14-10-38-18.bpo-31177.Sv91TN.rst
0 → 100644
View file @
edeca92c
Fix bug that prevented using :meth:`reset_mock <unittest.mock.Mock.reset_mock>`
on mock instances with deleted attributes
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment