Skip to content

bpo-24758: Improve the error msg for unittest.mock.Mock()'s unsafe mode #12991

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

Merged
kushaldas merged 3 commits into from
May 8, 2019
Merged

bpo-24758: Improve the error msg for unittest.mock.Mock()'s unsafe mode #12991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
debfe25
bpo-24758: Improve the error msg for unittest.mock.Mock()'s unsafe mode
ZackerySpytz Apr 28, 2019
36a022b
Merge remote-tracking branch 'upstream/master' into bpo-24758-error-m…
ZackerySpytz May 6, 2019
96edbb4
Make the requested changes.
ZackerySpytz May 6, 2019
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: 2 additions & 1 deletion Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,8 @@ def __getattr__(self, name):
raise AttributeError(name)
if not self._mock_unsafe:
if name.startswith(('assert', 'assret')):
raise AttributeError(name)
raise AttributeError("Attributes cannot start with 'assert' "
"or 'assret'")

result = self._mock_children.get(name)
if result is _deleted:
Expand Down
5 changes: 3 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 @@ -1453,9 +1453,10 @@ def static_method(): pass
#Issue21238
def test_mock_unsafe(self):
m = Mock()
with self.assertRaises(AttributeError):
msg = "Attributes cannot start with 'assert' or 'assret'"
with self.assertRaisesRegex(AttributeError, msg):
m.assert_foo_call()
with self.assertRaises(AttributeError):
with self.assertRaisesRegex(AttributeError, msg):
m.assret_foo_call()
m = Mock(unsafe=True)
m.assert_foo_call()
Expand Down