From 3dee534f1e25109e0bdb681de0746c336f4b8840 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Sat, 13 Jul 2013 17:57:56 +0300 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/smart.py | 1 + meta/lib/oeqa/utils/decorators.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') 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(): class SmartHelpTest(oeRuntimeTest): + @skipUnlessPassed('test_ssh') def test_smart_help(self): status = self.target.run('smart --help')[0] 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): def __call__(self,f): def wrapped_f(*args): - if self.testcase in (oeRuntimeTest.testSkipped, oeRuntimeTest.testFailures, oeRuntimeTest.testErrors): + if self.testcase in oeRuntimeTest.testSkipped or \ + self.testcase in oeRuntimeTest.testFailures or \ + self.testcase in oeRuntimeTest.testErrors: raise unittest.SkipTest("Testcase dependency not met: %s" % self.testcase) f(*args) wrapped_f.__name__ = f.__name__ -- cgit 1.2.3-korg