GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand Down Expand Up		@@ -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()

8 changes: 7 additions & 1 deletion 8 Lib/unittest/mock.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand Down

2 changes: 2 additions & 0 deletions 2 Misc/NEWS.d/next/Library/2020-09-16-16-53-06.bpo-41768.8_fWkC.rst

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		:mod:`unittest.mock` speccing no longer calls class properties.
		Patch by Melanie Witt.

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.