summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKushal Das <kushaldas@gmail.com>2014-04-15 19:35:50 (GMT)
committerKushal Das <kushaldas@gmail.com>2014-04-15 19:35:50 (GMT)
commit484f8a875b986690f9d8aec2089368b70184e009 (patch)
tree6953671c7a532c265b20f74fa67d7f969f4d9c79 /Lib
parent9574355ff3cffde2dc67ee60a61e468cec1d46f7 (diff)
downloadcpython-484f8a875b986690f9d8aec2089368b70184e009.zip
cpython-484f8a875b986690f9d8aec2089368b70184e009.tar.gz
cpython-484f8a875b986690f9d8aec2089368b70184e009.tar.bz2
Closes Issue 21222.
Passing name keyword argument to mock.create_autospec now works.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/unittest/mock.py2
-rw-r--r--Lib/unittest/test/testmock/testmock.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index f1f6522..13fd7b1 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -2096,6 +2096,8 @@ 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
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 70f19d3..23675b9 100644
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -1182,6 +1182,10 @@ class MockTest(unittest.TestCase):
func.mock_calls, [call(1, 2), call(3, 4)]
)
+ #Issue21222
+ def test_create_autospec_with_name(self):
+ m = mock.create_autospec(object(), name='sweet_func')
+ self.assertIn('sweet_func', repr(m))
def test_mock_add_spec(self):
class _One(object):