openstack/deb-python-crank
Code Issues Proposed changes

Test for functions decorated with __wrapped__

Browse Source
This commit is contained in:
Alessandro Molina 2017-03-17 23:56:16 +01:00
parent b22a42fd21
commit b740455572
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crank/util.py
View File

@ -54,6 +54,10 @@ def get_argspec(func):
else: #pragma: no cover else: #pragma: no cover
im_func = getattr(func, '__func__', func) im_func = getattr(func, '__func__', func)
if hasattr(im_func, '__wrapped__'):
# Cope with decorated functions if they properly updated __wrapped__
im_func = im_func.__wrapped__
try: try:
argspec = _cached_argspecs[im_func] argspec = _cached_argspecs[im_func]
except KeyError: except KeyError:

16
tests/test_util.py
View File

@ -1,6 +1,7 @@
# encoding: utf-8 # encoding: utf-8
from crank.util import * from crank.util import *
from crank.util import _PY2 from crank.util import _PY2
import functools
if _PY2: if _PY2:
def u(s): return s.decode('utf-8') def u(s): return s.decode('utf-8')
@ -13,6 +14,17 @@ def mock_f(self, a, b, c=None, d=50, *args, **kw):
def mock_f2(self, a, b): def mock_f2(self, a, b):
pass pass
def decorator(f):
@functools.wraps(f)
def f_(*args, **kwargs):
return f(*args, **kwargs)
if not hasattr(f_, '__wrapped__'):
# Not all python versions update it
f_.__wrapped__ = f
return f_
deco_mock_f = decorator(mock_f)
class mock_c(object): class mock_c(object):
def mock_f(self, a, b): def mock_f(self, a, b):
pass pass
@ -20,10 +32,14 @@ class mock_c(object):
def test_get_argspec_first_call(): def test_get_argspec_first_call():
argspec = get_argspec(mock_f) argspec = get_argspec(mock_f)
assert argspec == (['a', 'b', 'c', 'd'], 'args', 'kw', (None, 50)), argspec assert argspec == (['a', 'b', 'c', 'd'], 'args', 'kw', (None, 50)), argspec
deco_argspec = get_argspec(deco_mock_f)
assert argspec == deco_argspec, deco_argspec
def test_get_argspec_cached(): def test_get_argspec_cached():
argspec = get_argspec(mock_f) argspec = get_argspec(mock_f)
assert argspec == (['a', 'b', 'c', 'd'], 'args', 'kw', (None, 50)), argspec assert argspec == (['a', 'b', 'c', 'd'], 'args', 'kw', (None, 50)), argspec
deco_argspec = get_argspec(deco_mock_f)
assert argspec == deco_argspec, deco_argspec
def test_get_params_with_argspec(): def test_get_params_with_argspec():
params = get_params_with_argspec(mock_f, {'a':1, 'c':2}, [3]) params = get_params_with_argspec(mock_f, {'a':1, 'c':2}, [3])