oeqa/decorators: Use wraps consistently

We want the decorator to leave the function names of the test unchanged. Some
decorators are already using wraps for this but not all. Fix this to be consistent
allowing inspection of the test to give the wanted values.

(From OE-Core rev: 9e4d60b29ff5667d23a89953ce7139b34c11d40b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-05-14 09:26:52 +01:00
parent 7a93223483
commit bb44e5b99d

View File

@@ -57,6 +57,7 @@ class skipIfFailure(object):
self.testcase = testcase self.testcase = testcase
def __call__(self,f): def __call__(self,f):
@wraps(f)
def wrapped_f(*args, **kwargs): def wrapped_f(*args, **kwargs):
res = getResults() res = getResults()
if self.testcase in (res.getFailList() or res.getErrorList()): if self.testcase in (res.getFailList() or res.getErrorList()):
@@ -71,6 +72,7 @@ class skipIfSkipped(object):
self.testcase = testcase self.testcase = testcase
def __call__(self,f): def __call__(self,f):
@wraps(f)
def wrapped_f(*args, **kwargs): def wrapped_f(*args, **kwargs):
res = getResults() res = getResults()
if self.testcase in res.getSkipList(): if self.testcase in res.getSkipList():
@@ -85,6 +87,7 @@ class skipUnlessPassed(object):
self.testcase = testcase self.testcase = testcase
def __call__(self,f): def __call__(self,f):
@wraps(f)
def wrapped_f(*args, **kwargs): def wrapped_f(*args, **kwargs):
res = getResults() res = getResults()
if self.testcase in res.getSkipList() or \ if self.testcase in res.getSkipList() or \
@@ -97,11 +100,11 @@ class skipUnlessPassed(object):
return wrapped_f return wrapped_f
class testcase(object): class testcase(object):
def __init__(self, test_case): def __init__(self, test_case):
self.test_case = test_case self.test_case = test_case
def __call__(self, func): def __call__(self, func):
@wraps(func)
def wrapped_f(*args, **kwargs): def wrapped_f(*args, **kwargs):
return func(*args, **kwargs) return func(*args, **kwargs)
wrapped_f.test_case = self.test_case wrapped_f.test_case = self.test_case