gh-120732: Fix `name` passing to `Mock`, when using kwargs to `create_autospec` (#120737)

This commit is contained in:
Nikita Sobolev 2024-06-19 23:35:11 +03:00 committed by GitHub
parent ed5ae6c4d7
commit 1e4815692f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 7 deletions

View File

@ -129,6 +129,11 @@ class MockTest(unittest.TestCase):
# pass kwargs with respect to the parent mock.
self.assertEqual(class_mock().return_value.meth.side_effect, None)
def test_create_autospec_correctly_handles_name(self):
class X: ...
mock = create_autospec(X, spec_set=True, name="Y")
self.assertEqual(mock._mock_name, "Y")
def test_repr(self):
mock = Mock(name='foo')
self.assertIn('foo', repr(mock))

View File

@ -2755,6 +2755,12 @@ def create_autospec(spec, spec_set=False, instance=False, _parent=None,
if not unsafe:
_check_spec_arg_typos(kwargs)
_name = kwargs.pop('name', _name)
_new_name = _name
if _parent is None:
# for a top level object no _new_name should be set
_new_name = ''
_kwargs.update(kwargs)
Klass = MagicMock
@ -2772,13 +2778,6 @@ def create_autospec(spec, spec_set=False, instance=False, _parent=None,
elif is_type and instance and not _instance_callable(spec):
Klass = NonCallableMagicMock
_name = _kwargs.pop('name', _name)
_new_name = _name
if _parent is None:
# for a top level object no _new_name should be set
_new_name = ''
mock = Klass(parent=_parent, _new_parent=_parent, _new_name=_new_name,
name=_name, **_kwargs)

View File

@ -0,0 +1,2 @@
Fix ``name`` passing to :class:`unittest.mock.Mock` object when using
:func:`unittest.mock.create_autospec`.