mirror of
https://github.com/python/cpython
synced 2024-10-15 00:28:04 +00:00
[3.12] gh-120732: Fix name
passing to Mock
, when using kwargs to create_autospec
(GH-120737) (#120761)
gh-120732: Fix `name` passing to `Mock`, when using kwargs to `create_autospec` (GH-120737)
(cherry picked from commit 1e4815692f
)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
This commit is contained in:
parent
d6a36c97c2
commit
34ace5ba4c
|
@ -118,6 +118,11 @@ def test_create_autospec_should_be_configurable_by_kwargs(self):
|
|||
# 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))
|
||||
|
|
|
@ -2725,6 +2725,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
|
||||
|
@ -2742,13 +2748,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)
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix ``name`` passing to :class:`unittest.mock.Mock` object when using
|
||||
:func:`unittest.mock.create_autospec`.
|
Loading…
Reference in a new issue