MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oeqa/selftest/wic: don't hardcode kernel image type in test_wic_rm

Browse Source 
Don't assume bzImage, resepct KERNEL_IMAGETYPE.

(From OE-Core rev: f03d47833593734489e73f054f41c3dbbe423204)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2022-03-31 19:28:59 +01:00 committed by Richard Purdie
parent e9c8d638f9
commit e2d112b471
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/lib/oeqa/selftest/cases/wic.py
View File

@ -1337,21 +1337,23 @@ class Wic2(WicTestCase):
self.assertEqual(1, len(images))
sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
# Not bulletproof but hopefully sufficient
kerneltype = get_bb_var('KERNEL_IMAGETYPE', 'virtual/kernel')
# list directory content of the first partition
result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot))
self.assertIn('\nBZIMAGE ', result.output)
self.assertIn('\n%s ' % kerneltype.upper(), result.output)
self.assertIn('\nEFI <DIR> ', result.output)
# remove file
runCmd("wic rm %s:1/bzimage -n %s" % (images[0], sysroot))
# remove file. EFI partitions are case-insensitive so exercise that too
runCmd("wic rm %s:1/%s -n %s" % (images[0], kerneltype.lower(), sysroot))
# remove directory
runCmd("wic rm %s:1/efi -n %s" % (images[0], sysroot))
# check if they're removed
result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot))
self.assertNotIn('\nBZIMAGE ', result.output)
self.assertNotIn('\n%s ' % kerneltype.upper(), result.output)
self.assertNotIn('\nEFI <DIR> ', result.output)
def test_mkfs_extraopts(self):