diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-07-13 17:57:56 +0300 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-07-15 10:29:27 -0700 |
| commit | cf1790d992f067be8d5f9894458f55f6f1bdc61f (patch) | |
| tree | 0b38f612a5faddb1734f1bfb1a61cd12a425a25c | |
| parent | 8bbb7116cf02466dfc59a17dc7bb51287aeea55b (diff) | |
| download | openembedded-core-cf1790d992f067be8d5f9894458f55f6f1bdc61f.tar.gz openembedded-core-cf1790d992f067be8d5f9894458f55f6f1bdc61f.tar.bz2 openembedded-core-cf1790d992f067be8d5f9894458f55f6f1bdc61f.zip | |
lib/oeqa: fix dependecy check
Adds missing skip for smart test and fix the check (which I somehow broke
a while ago).
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/lib/oeqa/runtime/smart.py | 1 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/decorators.py | 4 |
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(): 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__ |