p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch num_mock_patch_args to do identity checks for the sentinels

This commit is contained in:
Ronny Pfannschmidt 2019-07-19 22:10:45 +02:00
parent 240d314f36
commit 8c7d9124ba
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/_pytest/compat.py
View File

@ -64,13 +64,18 @@ def num_mock_patch_args(function):
patchings = getattr(function, "patchings", None) patchings = getattr(function, "patchings", None)
if not patchings: if not patchings:
return 0 return 0
mock_modules = [sys.modules.get("mock"), sys.modules.get("unittest.mock")]
if any(mock_modules): mock_sentinel = getattr(sys.modules.get("mock"), "DEFAULT", object())
sentinels = [m.DEFAULT for m in mock_modules if m is not None] ut_mock_sentinel = getattr(sys.modules.get("unittest.mock"), "DEFAULT", object())
return len(
[p for p in patchings if not p.attribute_name and p.new in sentinels] return len(
) [
return len(patchings) p
for p in patchings
if not p.attribute_name
and (p.new is mock_sentinel or p.new is ut_mock_sentinel)
]
)
def getfuncargnames(function, is_method=False, cls=None): def getfuncargnames(function, is_method=False, cls=None):