summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Chee Yang <chee.yang.lee@intel.com>2021-02-04 08:29:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:55:53 +0000
commitdc38d5e494e53a7a03d5bd8d2429d0ef54cfbbbc (patch)
tree688617a71105df57cb5e8e7064dfb729532b7d69
parent6c7a7d371fc44f5b6bec6a8769a422fece88ec76 (diff)
downloadpoky-dc38d5e494e53a7a03d5bd8d2429d0ef54cfbbbc.tar.gz
wic/selftest: test_permissions also test bitbake image
existing test case test_permissions use Wic command as standalone tools to create wic image and check that wic image for permissions. add extra steps to the test case to also check against image build using bitbake do_image_wic. (From OE-Core rev: 9efabaff73090b08233b4fcef22142b9ac0c11aa) Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 551ce73a90757ba43501fe5cf9ac84a7b77de549) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index d4c0db8bda..0435aa29c9 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -516,6 +516,9 @@ part /part2 --source rootfs --ondisk mmcblk0 --fstype=ext4 --include-path %s"""
516 def test_permissions(self): 516 def test_permissions(self):
517 """Test permissions are respected""" 517 """Test permissions are respected"""
518 518
519 # prepare wicenv and rootfs
520 bitbake('core-image-minimal core-image-minimal-mtdutils -c do_rootfs_wicenv')
521
519 oldpath = os.environ['PATH'] 522 oldpath = os.environ['PATH']
520 os.environ['PATH'] = get_bb_var("PATH", "wic-tools") 523 os.environ['PATH'] = get_bb_var("PATH", "wic-tools")
521 524
@@ -549,6 +552,19 @@ part /etc --source rootfs --fstype=ext4 --change-directory=etc
549 res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part)) 552 res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part))
550 self.assertEqual(True, files_own_by_root(res.output)) 553 self.assertEqual(True, files_own_by_root(res.output))
551 554
555 config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "%s"\n' % wks_file
556 self.append_config(config)
557 bitbake('core-image-minimal')
558 tmpdir = os.path.join(get_bb_var('WORKDIR', 'core-image-minimal'),'build-wic')
559
560 # check each partition for permission
561 for part in glob(os.path.join(tmpdir, 'temp-*.direct.p*')):
562 res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part))
563 self.assertTrue(files_own_by_root(res.output)
564 ,msg='Files permission incorrect using wks set "%s"' % test)
565
566 # clean config and result directory for next cases
567 self.remove_config(config)
552 rmtree(self.resultdir, ignore_errors=True) 568 rmtree(self.resultdir, ignore_errors=True)
553 569
554 finally: 570 finally: