diff --git a/Lib/test/test_unittest/testmock/testmock.py b/Lib/test/test_unittest/testmock/testmock.py
index d1cae47a40eed4..c7895e73ad9a8c 100644
--- a/Lib/test/test_unittest/testmock/testmock.py
+++ b/Lib/test/test_unittest/testmock/testmock.py
@@ -38,6 +38,17 @@ def cmeth(cls, a, b, c, d=None): pass
def smeth(a, b, c, d=None): pass
+class SomethingElse(object):
+ def __init__(self):
+ self._instance = None
+
+ @property
+ def instance(self):
+ if not self._instance:
+ self._instance = 'object'
+ return self._instance
+
+
class Typos():
autospect = None
auto_spec = None
@@ -2293,6 +2304,26 @@ class Foo():
f'{__name__}.Typos', autospect=True, set_spec=True, auto_spec=True):
pass
+ def test_property_not_called_with_spec_mock(self):
+ obj = SomethingElse()
+ self.assertIsNone(obj._instance, msg='before mock')
+ mock = Mock(spec=obj)
+ self.assertIsNone(obj._instance, msg='after mock')
+ self.assertEqual('object', obj.instance)
+
+ def test_decorated_async_methods_with_spec_mock(self):
+ class Foo():
+ @classmethod
+ async def class_method(cls):
+ pass
+ @staticmethod
+ async def static_method():
+ pass
+ async def method(self):
+ pass
+ mock = Mock(spec=Foo)
+ for m in (mock.method, mock.class_method, mock.static_method):
+ self.assertIsInstance(m, AsyncMock)
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 7ca085760650af..22f81e55b567f2 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -526,7 +526,13 @@ def _mock_add_spec(self, spec, spec_set, _spec_as_instance=False,
spec_list = dir(spec)
for attr in spec_list:
- if iscoroutinefunction(getattr(spec, attr, None)):
+ static_attr = inspect.getattr_static(spec, attr, None)
+ unwrapped_attr = static_attr
+ try:
+ unwrapped_attr = inspect.unwrap(unwrapped_attr)
+ except ValueError:
+ pass
+ if iscoroutinefunction(unwrapped_attr):
_spec_asyncs.append(attr)
spec = spec_list
diff --git a/Misc/NEWS.d/next/Library/2020-09-16-16-53-06.bpo-41768.8_fWkC.rst b/Misc/NEWS.d/next/Library/2020-09-16-16-53-06.bpo-41768.8_fWkC.rst
new file mode 100644
index 00000000000000..bfd3a294d44efa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-09-16-16-53-06.bpo-41768.8_fWkC.rst
@@ -0,0 +1,2 @@
+:mod:`unittest.mock` speccing no longer calls class properties.
+Patch by Melanie Witt.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy