bpo-42532: Check if NonCallableMock's spec_arg is not None instead of call its __bool__ function (GH23613)

Check if NonCallableMock's spec_arg is not None instead of call its __bool__ function
This commit is contained in:
idanw206 2020-12-06 11:59:36 +02:00 committed by GitHub
parent 804d6893b8
commit c598a04dd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions

View File

@ -406,7 +406,7 @@ class NonCallableMock(Base):
# 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)

View File

@ -2165,6 +2165,16 @@ class MockTest(unittest.TestCase):
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()

View File

@ -0,0 +1 @@
Remove unexpected call of ``__bool__`` when passing a ``spec_arg`` argument to a Mock.