summaryrefslogtreecommitdiff
path: root/meta/lib/oeqa/runtime
diff options
context:
space:
mode:
authorLucian Musat <george.l.musat@intel.com>2015-01-14 17:14:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-19 07:50:43 +0000
commitb214c7b901fe0fad081d7a97f9e91cc218c66bd6 (patch)
tree112095f3722650850bf197bab8a2ce55b8a29427 /meta/lib/oeqa/runtime
parent2bb8b2abb689d91b7b7e28e6bd528747bde94dd2 (diff)
downloadopenembedded-core-b214c7b901fe0fad081d7a97f9e91cc218c66bd6.tar.gz
openembedded-core-b214c7b901fe0fad081d7a97f9e91cc218c66bd6.tar.bz2
openembedded-core-b214c7b901fe0fad081d7a97f9e91cc218c66bd6.zip
oeqa/ptest: Fixed complementary package install detection and added ptest-runner exit code check
Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r--meta/lib/oeqa/runtime/_ptest.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py
index bf4d04171c..81c9c43862 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/meta/lib/oeqa/runtime/_ptest.py
@@ -104,12 +104,15 @@ class PtestRunnerTest(oeRuntimeTest):
@skipUnlessPassed('test_ssh')
def test_ptestrunner(self):
self.add_smart_channel()
- cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest")
- if not cond:
+ (runnerstatus, result) = self.target.run('which ptest-runner', 0)
+ cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0)
+ if cond:
self.install_packages(self.install_complementary("*-ptest"))
self.install_packages(['ptest-runner'])
- self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0)
+ (runnerstatus, result) = self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0)
+ #exit code is !=0 even if ptest-runner executes because some ptest tests fail.
+ self.assertTrue(runnerstatus != 127, msg="Cannot execute ptest-runner!")
self.target.copy_from('/tmp/ptest.log', self.ptest_log)
shutil.copyfile(self.ptest_log, "ptest.log")