Skip to content
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

Jump to bottom

gh-65454: avoid triggering call to a PropertyMock in NonCallableMock.__setattr__ #120019

Merged
merged 3 commits into from
Jun 11, 2024
Merged

gh-65454: avoid triggering call to a PropertyMock in NonCallableMock.__setattr__ #120019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9459857
gh-65454: avoid triggering call to a PropertyMock in __setattr__
blhsing Jun 4, 2024
b9494fe
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 4, 2024
8e160c8
Update mock.py
blhsing Jun 4, 2024
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
8 changes: 8 additions & 0 deletions Lib/test/test_unittest/testmock/testhelpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,14 @@ def test_propertymock_side_effect(self):
p.assert_called_once_with()


def test_propertymock_attach(self):
m = Mock()
p = PropertyMock()
type(m).foo = p
m.attach_mock(p, 'foo')
self.assertEqual(m.mock_calls, [])


class TestCallablePredicate(unittest.TestCase):

def test_type(self):
Expand Down
3 changes: 3 additions & 0 deletions Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,9 @@ def __setattr__(self, name, value):
mock_name = f'{self._extract_mock_name()}.{name}'
raise AttributeError(f'Cannot set {mock_name}')

if isinstance(value, PropertyMock):
self.__dict__[name] = value
return
return object.__setattr__(self, name, value)


Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-06-04-08-57-02.gh-issue-65454.o9j4wF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:func:`unittest.mock.Mock.attach_mock` no longer triggers a call to a ``PropertyMock`` being attached.
Loading