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

oeqa/selftest/wic: Fix host contamination issue

Browse Source 
If wic.Wic2.test_gpt_partition_name is run on a system without sfdisk, the test
will currently fail. As done in another test, it needs to use sfdisk from the
wic-tools sysroot. This patch fixes that host contamination issue.

(From OE-Core rev: 6f9200cc30d50888b9b63103824880abaf8b5eea)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2023-06-02 18:00:46 +01:00
parent 9a106486ad
commit 511d007248
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1359,17 +1359,19 @@ class Wic2(WicTestCase):
bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
image_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.wic' % bb_vars['IMAGE_LINK_NAME'])
sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
# Image is created
self.assertTrue(os.path.exists(image_path), "image file %s doesn't exist" % image_path)
# Check the names of the three partitions
# as listed in test_gpt_partition_name.wks
result = runCmd("sfdisk --part-label %s 1" % image_path)
result = runCmd("%s/usr/sbin/sfdisk --part-label %s 1" % (sysroot, image_path))
self.assertEqual('boot-A', result.output)
result = runCmd("sfdisk --part-label %s 2" % image_path)
result = runCmd("%s/usr/sbin/sfdisk --part-label %s 2" % (sysroot, image_path))
self.assertEqual('root-A', result.output)
# When the --part-name is not defined, the partition name is equal to the --label
result = runCmd("sfdisk --part-label %s 3" % image_path)
result = runCmd("%s/usr/sbin/sfdisk --part-label %s 3" % (sysroot, image_path))
self.assertEqual('ext-space', result.output)
class ModifyTests(WicTestCase):