@@ -1962,9 +1962,9 @@ INITRAMFS_IMAGE = "core-image-initramfs-boot"
class ModifyTests(WicTestCase):
def test_wic_ls(self):
"""Test listing image content using 'wic ls'"""
- runCmd("wic create wictestdisk "
+ runCmd("wic create wictestdisk -v %s "
"--image-name=core-image-minimal "
- "-D -o %s" % self.resultdir)
+ "-D -o %s" % (self.envfile, self.resultdir))
images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct"))
self.assertEqual(1, len(images))
@@ -1980,9 +1980,9 @@ class ModifyTests(WicTestCase):
def test_wic_cp(self):
"""Test copy files and directories to the the wic image."""
- runCmd("wic create wictestdisk "
+ runCmd("wic create wictestdisk -v %s "
"--image-name=core-image-minimal "
- "-D -o %s" % self.resultdir)
+ "-D -o %s" % (self.envfile, self.resultdir))
images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct"))
self.assertEqual(1, len(images))
@@ -2026,9 +2026,9 @@ class ModifyTests(WicTestCase):
def test_wic_rm(self):
"""Test removing files and directories from the the wic image."""
- runCmd("wic create mkefidisk "
+ runCmd("wic create mkefidisk -v %s "
"--image-name=core-image-minimal "
- "-D -o %s" % self.resultdir)
+ "-D -o %s" % (self.envfile, self.resultdir))
images = glob(os.path.join(self.resultdir, "mkefidisk-*.direct"))
self.assertEqual(1, len(images))
@@ -2054,9 +2054,9 @@ class ModifyTests(WicTestCase):
def test_wic_ls_ext(self):
"""Test listing content of the ext partition using 'wic ls'"""
- runCmd("wic create wictestdisk "
+ runCmd("wic create wictestdisk -v %s "
"--image-name=core-image-minimal "
- "-D -o %s" % self.resultdir)
+ "-D -o %s" % (self.envfile, self.resultdir))
images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct"))
self.assertEqual(1, len(images))
@@ -2069,9 +2069,9 @@ class ModifyTests(WicTestCase):
def test_wic_cp_ext(self):
"""Test copy files and directories to the ext partition."""
- runCmd("wic create wictestdisk "
+ runCmd("wic create wictestdisk -v %s "
"--image-name=core-image-minimal "
- "-D -o %s" % self.resultdir)
+ "-D -o %s" % (self.envfile, self.resultdir))
images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct"))
self.assertEqual(1, len(images))
@@ -2169,9 +2169,9 @@ class ModifyTests(WicTestCase):
def test_wic_rm_ext(self):
"""Test removing files from the ext partition."""
- runCmd("wic create mkefidisk "
+ runCmd("wic create mkefidisk -v %s "
"--image-name=core-image-minimal "
- "-D -o %s" % self.resultdir)
+ "-D -o %s" % (self.envfile, self.resultdir))
images = glob(os.path.join(self.resultdir, "mkefidisk-*.direct"))
self.assertEqual(1, len(images))
Changes for the wic.ModifyTests oe-selftests to pass now that wic is a stand-alone app and no longer part of oe-core. Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- changes in v5: - rebase with master - re-split out in to individual, smaller patches - now that the sector-size re-implementation is ahead of this patch, various wic subcommands (ls, cp, rm) no longer need a --vars file v4: skipped to align/combine with other patch set changes in v3: - squashed into 1 large patch changes in v2: - none --- meta/lib/oeqa/selftest/cases/wic.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)