Visitar URL original
gh-85934: Use getattr_static when adding mock spec by melwitt · Pull Request #22209 · python/cpython · GitHub
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
Next Next commit
bpo-41768: Use getattr_static when adding mock spec 
Since commit 77b3b77, class properties
are being called when adding mock specs and this can introduce side
effects for tests that are verifying state affected by code inside a
@Property.

This replaces the getattr call with a inspect.getattr_static call to
avoid executing class code as part of the mock speccing process.
  • Loading branch information
@melwitt
melwitt committed Aug 19, 2021
commit 0a617700c68c60c097229de337e8c284b8ea2ac4
2 changes: 1 addition & 1 deletion Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ def _mock_add_spec(self, spec, spec_set, _spec_as_instance=False,
_spec_asyncs = []

for attr in dir(spec):
if iscoroutinefunction(getattr(spec, attr, None)):
if iscoroutinefunction(inspect.getattr_static(spec, attr, None)):
_spec_asyncs.append(attr)

if spec is not None and not _is_list(spec):
Expand Down
16 changes: 16 additions & 0 deletions Lib/unittest/test/testmock/testmock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ 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'

Comment thread
melwitt marked this conversation as resolved.
Outdated

class Typos():
autospect = None
auto_spec = None
Expand Down Expand Up @@ -2249,6 +2259,12 @@ 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)
mock = Mock(spec=obj)
self.assertIsNone(obj._instance)
Comment thread
melwitt marked this conversation as resolved.
Outdated

Comment thread
melwitt marked this conversation as resolved.
Outdated

if __name__ == '__main__':
unittest.main()