gh-75988: Fix issues with autospec ignoring wrapped object

Lib/test/test_unittest/testmock/testmock.py

@@ -245,6 +245,31 @@ class B(object):
             with mock.patch('builtins.open', mock.mock_open()):
                 mock.mock_open()  # should still be valid with open() mocked
 
+    def test_create_autospec_wraps_class(self):
+        """Autospec a class with wraps & test if the call is passed to the
+        wrapped object."""
+        value = 'my_func is called'
+
+        class MyClass:
+            def my_func(self):
+                return value
+        class_mock = create_autospec(spec=MyClass, wraps=MyClass)
+        class_mock.return_value = mock.DEFAULT
+        self.assertEqual(class_mock().my_func(), value)
+        # Autospec should also wrap child attributes.
+        self.assertEqual(class_mock.my_func._mock_wraps, MyClass.my_func)
+
+    def test_create_autospec_wraps_function(self):
+        """Autospec a function or a method with wraps & test if the call is
+        passed to the wrapped object."""
+        value = 'my_func is called'
+
+        class MyClass:
+            def my_func(self):
+                return value
+        func_mock = create_autospec(spec=MyClass.my_func, wraps=MyClass.my_func)
+        self.assertEqual(func_mock(MyClass()), value)
+
     def test_explicit_parent(self):
         parent = Mock()
         mock1 = Mock(parent=parent, return_value=None)

Lib/unittest/mock.py

@@ -261,7 +261,7 @@ def reset_mock():
     funcopy.method_calls = _CallList()
     funcopy.mock_calls = _CallList()
 
-    funcopy.return_value = mock.return_value
+    funcopy.return_value = mock._mock_return_value
     funcopy.side_effect = mock.side_effect
     funcopy._mock_children = mock._mock_children
 
@@ -2785,9 +2785,12 @@ def create_autospec(spec, spec_set=False, instance=False, _parent=None,
     if _parent is not None and not instance:
         _parent._mock_children[_name] = mock
 
+    wrapped = kwargs.get('wraps')
+
     if is_type and not instance and 'return_value' not in kwargs:
         mock.return_value = create_autospec(spec, spec_set, instance=True,
-                                            _name='()', _parent=mock)
+                                            _name='()', _parent=mock,
+                                            wraps=wrapped)
 
     for entry in dir(spec):
         if _is_magic(entry):
@@ -2809,6 +2812,9 @@ def create_autospec(spec, spec_set=False, instance=False, _parent=None,
             continue
 
         kwargs = {'spec': original}
+        # Wrap child attributes also.
+        if wrapped and hasattr(wrapped, entry):
+            kwargs.update(wraps=original)
         if spec_set:
             kwargs = {'spec_set': original}