Skip to content

bpo-39966: Fix wrapped objects exception mockunittest #19102

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
amiremohamadi wants to merge 7 commits into from
Closed

bpo-39966: Fix wrapped objects exception mockunittest #19102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fee5005
use default value of the magic method if it is not present in the wra…
amiremohamadi Mar 21, 2020
d39687c
add test for checking wrapped object behavior if magic method is not …
amiremohamadi Mar 21, 2020
9b84739
add news
amiremohamadi Mar 21, 2020
e3538ad
fix whitespace issue
amiremohamadi Mar 21, 2020
13c602b
update unittest.mock news
amiremohamadi Mar 25, 2020
4bd6991
update testmock.py (simplify unittest.mock tests)
amiremohamadi Mar 25, 2020
720eacd
update testmock.py (simplify unittest.mock tests)
amiremohamadi Mar 25, 2020
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
2 changes: 1 addition & 1 deletion Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,7 @@ def __aiter__():
def _set_return_value(mock, method, name):
# If _mock_wraps is present then attach it so that wrapped object
# is used for return value is used when called.
if mock._mock_wraps is not None:
if mock._mock_wraps is not None and hasattr(mock._mock_wraps, name):
method._mock_wraps = getattr(mock._mock_wraps, name)
return

Expand Down
17 changes: 17 additions & 0 deletions Lib/unittest/test/testmock/testmock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,23 @@ def __custom_method__(self):
self.assertEqual(obj.__custom_method__(), "foo")


def test_magic_method_wraps_with_and_without_default_value(self):
class Foo:
def __bool__(self):
return False

class Bar:
pass

# use __bool__ attribute if it is present in the wrapped object
klass1 = MagicMock(wraps=Foo)
self.assertFalse(klass1())

# use the default value if the attribute is not present
klass2 = MagicMock(wraps=Bar)
self.assertTrue(klass2())


def test_exceptional_side_effect(self):
mock = Mock(side_effect=AttributeError)
self.assertRaises(AttributeError, mock)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-03-21-17-16-51.bpo-39966.3cRQmc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`unittest.mock` objects return a suitable default value when a magic
method is not defined on the mocked object.