summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-07-13 17:57:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-16 10:04:17 +0100
commit3dee534f1e25109e0bdb681de0746c336f4b8840 (patch)
tree6d5dd2db2d8b9fb73a316b526345c49c28ca9e4d
parent656a8b97c1f3f072834b6885282031e05ec61bd5 (diff)
downloadpoky-3dee534f1e25109e0bdb681de0746c336f4b8840.tar.gz
lib/oeqa: fix dependecy check
Adds missing skip for smart test and fix the check (which I somehow broke a while ago). (From OE-Core rev: cf1790d992f067be8d5f9894458f55f6f1bdc61f) 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>
-rw-r--r--meta/lib/oeqa/runtime/smart.py1
-rw-r--r--meta/lib/oeqa/utils/decorators.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index 8cfacd4602..0b03a30a3f 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -10,6 +10,7 @@ def setUpModule():
10 10
11class SmartHelpTest(oeRuntimeTest): 11class SmartHelpTest(oeRuntimeTest):
12 12
13 @skipUnlessPassed('test_ssh')
13 def test_smart_help(self): 14 def test_smart_help(self):
14 status = self.target.run('smart --help')[0] 15 status = self.target.run('smart --help')[0]
15 self.assertEqual(status, 0) 16 self.assertEqual(status, 0)
diff --git a/meta/lib/oeqa/utils/decorators.py b/meta/lib/oeqa/utils/decorators.py
index adec65eb44..e0ca6fd19e 100644
--- a/meta/lib/oeqa/utils/decorators.py
+++ b/meta/lib/oeqa/utils/decorators.py
@@ -41,7 +41,9 @@ class skipUnlessPassed(object):
41 41
42 def __call__(self,f): 42 def __call__(self,f):
43 def wrapped_f(*args): 43 def wrapped_f(*args):
44 if self.testcase in (oeRuntimeTest.testSkipped, oeRuntimeTest.testFailures, oeRuntimeTest.testErrors): 44 if self.testcase in oeRuntimeTest.testSkipped or \
45 self.testcase in oeRuntimeTest.testFailures or \
46 self.testcase in oeRuntimeTest.testErrors:
45 raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) 47 raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase)
46 f(*args) 48 f(*args)
47 wrapped_f.__name__ = f.__name__ 49 wrapped_f.__name__ = f.__name__