diff --git a/NEWS.d/2020-12-02-07-37-59.bpo-42532.ObNep_.rst b/NEWS.d/2020-12-02-07-37-59.bpo-42532.ObNep_.rst new file mode 100644 index 00000000..7465cb8e --- /dev/null +++ b/NEWS.d/2020-12-02-07-37-59.bpo-42532.ObNep_.rst @@ -0,0 +1 @@ +Remove unexpected call of ``__bool__`` when passing a ``spec_arg`` argument to a Mock. diff --git a/mock/mock.py b/mock/mock.py index e4c20f93..6ba80d7c 100644 --- a/mock/mock.py +++ b/mock/mock.py @@ -408,7 +408,7 @@ def __new__(cls, *args, **kw): # Check if spec is an async object or function bound_args = _MOCK_SIG.bind_partial(cls, *args, **kw).arguments spec_arg = bound_args.get('spec_set', bound_args.get('spec')) - if spec_arg and _is_async_obj(spec_arg): + if spec_arg is not None and _is_async_obj(spec_arg): bases = (AsyncMockMixin, cls) new = type(cls.__name__, bases, {'__doc__': cls.__doc__}) instance = _safe_super(NonCallableMock, cls).__new__(new) diff --git a/mock/tests/testmock.py b/mock/tests/testmock.py index 2293cfaa..5702b6da 100644 --- a/mock/tests/testmock.py +++ b/mock/tests/testmock.py @@ -2167,6 +2167,16 @@ def trace(frame, event, arg): # pragma: no cover obj = mock(spec=Something) self.assertIsInstance(obj, Something) + def test_bool_not_called_when_passing_spec_arg(self): + class Something: + def __init__(self): + self.obj_with_bool_func = unittest.mock.MagicMock() + + obj = Something() + with unittest.mock.patch.object(obj, 'obj_with_bool_func', autospec=True): pass + + self.assertEqual(obj.obj_with_bool_func.__bool__.call_count, 0) + if __name__ == '__main__': unittest.main()