bpo-29403: Fix mock's broken autospec behavior on method-bound builtin functions (GH-3)

Cython will, in the right circumstances, offer a MethodType instance
where im_func is a builtin function. Any instance of MethodType is
automatically assumed to be a Python-defined function (more
specifically, a function that has an inspectable signature), but
_set_signature was still conservative in its assumptions. As a result
_set_signature would return early with None instead of a mock since
the im_func had no inspectable signature. This causes problems
deeper inside mock, as _set_signature is assumed to _always_
return a mock, and nothing checked its return value.

In similar corner cases, autospec will simply not check the spec of the
function, so _set_signature is amended to now return early with the
original, not-wrapped mock object.

Patch by Aaron Gallagher.
This commit is contained in:
Aaron Gallagher 2017-07-19 17:01:14 -07:00 committed by Berker Peksag
parent ed014f7e13
commit 856cbcc12f
3 changed files with 18 additions and 1 deletions

View file

@ -155,7 +155,7 @@ def _set_signature(mock, original, instance=False):
skipfirst = isinstance(original, type)
result = _get_signature_object(original, instance, skipfirst)
if result is None:
return
return mock
func, sig = result
def checksig(*args, **kwargs):
sig.bind(*args, **kwargs)