Skip to content

gh-85934: Use getattr_static when adding mock spec #22209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carljm merged 13 commits into from
May 23, 2023
Merged

gh-85934: Use getattr_static when adding mock spec #22209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0a61770
bpo-41768: Use getattr_static when adding mock spec
melwitt Sep 12, 2020
943f8d3
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 16, 2020
4bdc642
Return object from SomethingElse.instance property
melwitt Sep 19, 2020
2e05daa
Apply suggestions from code review
melwitt Sep 19, 2020
a916d4b
Clean up whitespace damage and adjust assert
melwitt Sep 19, 2020
fad2710
Merge branch 'main' of github.com:python/cpython into unittest.mock-g…
melwitt Nov 1, 2022
d953168
Add newline at the end of NEWS entry
melwitt Nov 1, 2022
3f7a9f2
Merge branch 'main' into unittest.mock-getattr
terryjreedy Apr 27, 2023
fcb1fc8
Merge branch 'main' of https://github.com/python/cpython into unittes…
melwitt May 4, 2023
698856c
Move getattr_static call into existing loop
melwitt May 4, 2023
9baa71f
Update Misc/NEWS.d/next/Library/2020-09-16-16-53-06.bpo-41768.8_fWkC.rst
melwitt May 4, 2023
0ab362e
Merge branch 'python:main' into unittest.mock-getattr
melwitt May 16, 2023
a20b360
Handle async methods decorated with @classmethod or @staticmethod
melwitt May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Handle async methods decorated with @classmethod or @staticmethod
  • Loading branch information
@melwitt
melwitt committed May 16, 2023
commit a20b360008ec9232e3b80043a4c2951ef3125802
14 changes: 14 additions & 0 deletions Lib/test/test_unittest/testmock/testmock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2311,5 +2311,19 @@ def test_property_not_called_with_spec_mock(self):
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 Lib/unittest/mock.py
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(inspect.getattr_static(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