Skip to content

bpo-36871: Ensure method signature is used when asserting mock calls to a method #13261

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
cjw296 merged 6 commits into from
Aug 29, 2019
Merged

bpo-36871: Ensure method signature is used when asserting mock calls to a method #13261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
acfe960
Fix call_matcher for mock when using methods
tirkarthi May 12, 2019
4788924
Add NEWS entry
tirkarthi May 12, 2019
5e9e4e6
Use None check and convert doctest to unittest
tirkarthi May 12, 2019
ec2daf5
Use better name for mock in tests. Handle _SpecState when the attribu…
tirkarthi May 13, 2019
01aac71
Use reset_mock instead of reinitialization. Change inner class constr…
tirkarthi Jun 24, 2019
67c9299
Reword comment regarding call object lookup logic
tirkarthi Jul 3, 2019
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
Next Next commit
Use None check and convert doctest to unittest
  • Loading branch information
@tirkarthi
tirkarthi committed May 12, 2019
commit 5e9e4e64b093765d1d6b6d0e6fce814440d3b21f
4 changes: 2 additions & 2 deletions Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,12 +754,12 @@ def _get_call_signature_from_name(self, name):

for name in names:
child = children.get(name)
if not child:
if child is None:
break
else:
children = child._mock_children.get(name)
sig = child._spec_signature
if not children:
if children is None:
break

return sig
Expand Down
8 changes: 8 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 @@ -1368,6 +1368,14 @@ def meth1(self, a, b): pass
)


def test_assert_has_calls_nested_without_spec(self):
m = MagicMock()
m().foo().bar().baz()
m.one().two().three()
calls = call.one().two().three().call_list()
m.assert_has_calls(calls)


def test_assert_has_calls_with_function_spec(self):
def f(a, b, c, d=None): pass

Expand Down