Skip to contentSkip to conversation

Fix for oe-selftest failure

PATCH New Paul Eggleton 1 participant 2 messages Oct 26, 2015

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Fix for oe-selftest failure

Fix an oe-selftest failure seen testing master-next on the Yocto Project autobuilder.

The following changes since commit 73f8a0bf3b99d480bf97e266da0fb048714b4caf:

build-appliance-image: Update to jethro head revision (2015-10-21 23:13:03 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/deco-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/deco-fix

Paul Eggleton (1):
oeqa/utils/decorators: fix missing keyword arguments on decorators

 meta/lib/oeqa/utils/decorators.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 1/1 oeqa/utils/decorators: fix missing keyword arguments on decorators

We need to handle keyword arguments here or sending a keyword argument to a decorated function that accepts keyword arguments will trigger an error. (This showed up when testcase decorators were added to the recipetool.RecipetoolTests.test_recipetool_appendsrcfiles_basic_subdir test).

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/lib/oeqa/utils/decorators.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
meta/lib/oeqa/utils/decorators.py +8 -8
index 2169a20..0d79223 100644
@@ -57,11 +57,11 @@ class skipIfFailure(object):
         self.testcase = testcase
 
     def __call__(self,f):
-        def wrapped_f(*args):
+        def wrapped_f(*args, **kwargs):
             res = getResults()
             if self.testcase in (res.getFailList() or res.getErrorList()):
                 raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase)
-            return f(*args)
+            return f(*args, **kwargs)
         wrapped_f.__name__ = f.__name__
         return wrapped_f
 

@@ -71,11 +71,11 @@ class skipIfSkipped(object):
         self.testcase = testcase
 
     def __call__(self,f):
-        def wrapped_f(*args):
+        def wrapped_f(*args, **kwargs):
             res = getResults()
             if self.testcase in res.getSkipList():
                 raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase)
-            return f(*args)
+            return f(*args, **kwargs)
         wrapped_f.__name__ = f.__name__
         return wrapped_f
 

@@ -85,13 +85,13 @@ class skipUnlessPassed(object):
         self.testcase = testcase
 
     def __call__(self,f):
-        def wrapped_f(*args):
+        def wrapped_f(*args, **kwargs):
             res = getResults()
             if self.testcase in res.getSkipList() or \
                     self.testcase in res.getFailList() or \
                     self.testcase in res.getErrorList():
                 raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase)
-            return f(*args)
+            return f(*args, **kwargs)
         wrapped_f.__name__ = f.__name__
         wrapped_f._depends_on = self.testcase
         return wrapped_f

@@ -102,8 +102,8 @@ class testcase(object):
         self.test_case = test_case
 
     def __call__(self, func):
-        def wrapped_f(*args):
-            return func(*args)
+        def wrapped_f(*args, **kwargs):
+            return func(*args, **kwargs)
         wrapped_f.test_case = self.test_case
         wrapped_f.__name__ = func.__name__
         return wrapped_f
Signature · 1 line
2.1.0