[oe-commits] Ed Bartosh : oe-selftest: wic: Fix testcase
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 23 10:55:14 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: dda85cd420d47d97b0d0b0f294b37cd6066c541c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dda85cd420d47d97b0d0b0f294b37cd6066c541c
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date: Tue Jun 16 09:43:17 2015 +0300
oe-selftest: wic: Fix testcase
Fixed test05_build_artifacts testcase by using values of MACHINE
and BUILD_SYS bitbake variables in paths to artifacts.
Test was failing because of hardcoded machine(qemux86) and
build_sys(qemux86-poky-linux) in artifact paths.
[YOCTO #7730]
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
meta/lib/oeqa/selftest/wic.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 358f09e..60c8cb3 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -29,7 +29,7 @@ from glob import glob
from shutil import rmtree
from oeqa.selftest.base import oeSelfTest
-from oeqa.utils.commands import runCmd, bitbake
+from oeqa.utils.commands import runCmd, bitbake, get_bb_var
class Wic(oeSelfTest):
"""Wic test class."""
@@ -66,12 +66,15 @@ class Wic(oeSelfTest):
def test05_build_artifacts(self):
"""Test wic create directdisk providing all artifacts."""
- self.assertEqual(0, runCmd("wic create directdisk "
- "-b tmp/sysroots/qemux86/usr/share "
- "-k tmp/deploy/images/qemux86 "
- "-n tmp/sysroots/x86_64-linux "
- "-r tmp/work/qemux86-poky-linux/"
- "core-image-minimal/1.0-r0/rootfs").status)
+ vars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \
+ for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
+ 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
+ status = runCmd("wic create directdisk "
+ "-b %(staging_datadir)s "
+ "-k %(deploy_dir_image)s "
+ "-n %(staging_dir_native)s "
+ "-r %(image_rootfs)s" % vars).status
+ self.assertEqual(0, status)
self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
def test06_gpt_image(self):
More information about the Openembedded-commits
mailing list