* [PATCH] oeqa/selftest/wic: Fix host contamination issue
@ 2023-06-02 17:02 Richard Purdie
0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2023-06-02 17:02 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/lib/oeqa/selftest/cases/wic.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index d4793437735..a3c6deb5aa3 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -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):
--
2.39.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-02 17:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-02 17:02 [PATCH] oeqa/selftest/wic: Fix host contamination issue Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).