diff options
author | Mihai Lindner <mihaix.lindner@linux.intel.com> | 2013-08-22 09:12:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:47:21 +0100 |
commit | 2c8339894045733e297559ddfb1fb829fc6da0fd (patch) | |
tree | a16ae193f8bed83bcb183a001a4cf5d4b7521347 /meta/lib | |
parent | a9dab56e5d70b80b939765482a90a536df817ced (diff) | |
download | poky-2c8339894045733e297559ddfb1fb829fc6da0fd.tar.gz |
lib/oeqa/utils: decorators: return the decorated method
Decorators should return whatever the decorated methods return.
(From OE-Core rev: c92513d6ff3f8f06d937a5cdf4d94708f27c3850)
Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/utils/decorators.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/utils/decorators.py b/meta/lib/oeqa/utils/decorators.py index e0ca6fd19e..33fed5a10b 100644 --- a/meta/lib/oeqa/utils/decorators.py +++ b/meta/lib/oeqa/utils/decorators.py | |||
@@ -17,7 +17,7 @@ class skipIfFailure(object): | |||
17 | def wrapped_f(*args): | 17 | def wrapped_f(*args): |
18 | if self.testcase in (oeRuntimeTest.testFailures or oeRuntimeTest.testErrors): | 18 | if self.testcase in (oeRuntimeTest.testFailures or oeRuntimeTest.testErrors): |
19 | raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) | 19 | raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) |
20 | f(*args) | 20 | return f(*args) |
21 | wrapped_f.__name__ = f.__name__ | 21 | wrapped_f.__name__ = f.__name__ |
22 | return wrapped_f | 22 | return wrapped_f |
23 | 23 | ||
@@ -30,7 +30,7 @@ class skipIfSkipped(object): | |||
30 | def wrapped_f(*args): | 30 | def wrapped_f(*args): |
31 | if self.testcase in oeRuntimeTest.testSkipped: | 31 | if self.testcase in oeRuntimeTest.testSkipped: |
32 | raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) | 32 | raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) |
33 | f(*args) | 33 | return f(*args) |
34 | wrapped_f.__name__ = f.__name__ | 34 | wrapped_f.__name__ = f.__name__ |
35 | return wrapped_f | 35 | return wrapped_f |
36 | 36 | ||
@@ -45,6 +45,6 @@ class skipUnlessPassed(object): | |||
45 | self.testcase in oeRuntimeTest.testFailures or \ | 45 | self.testcase in oeRuntimeTest.testFailures or \ |
46 | self.testcase in oeRuntimeTest.testErrors: | 46 | self.testcase in oeRuntimeTest.testErrors: |
47 | raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) | 47 | raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) |
48 | f(*args) | 48 | return f(*args) |
49 | wrapped_f.__name__ = f.__name__ | 49 | wrapped_f.__name__ = f.__name__ |
50 | return wrapped_f | 50 | return wrapped_f |