mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
oeqa/selftest: refactor common functions
(From OE-Core rev: 66de5de793f3c86502d193f7e3abc8fa17642369) Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9c8ea9dcf1
commit
8eb35a9558
@@ -8,11 +8,14 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
|
||||
class OverlayFSTests(OESelftestTestCase):
|
||||
"""Overlayfs class usage tests"""
|
||||
|
||||
def getline(self, res, line):
|
||||
for l in res.output.split('\n'):
|
||||
def getline_qemu(self, out, line):
|
||||
for l in out.split('\n'):
|
||||
if line in l:
|
||||
return l
|
||||
|
||||
def getline(self, res, line):
|
||||
return self.getline_qemu(res.output, line)
|
||||
|
||||
def add_overlay_conf_to_machine(self):
|
||||
machine_inc = """
|
||||
OVERLAYFS_MOUNT_POINT[mnt-overlay] = "/mnt/overlay"
|
||||
@@ -154,18 +157,13 @@ EOT
|
||||
|
||||
bitbake('core-image-minimal')
|
||||
|
||||
def getline_qemu(out, line):
|
||||
for l in out.split('\n'):
|
||||
if line in l:
|
||||
return l
|
||||
|
||||
with runqemu('core-image-minimal') as qemu:
|
||||
# Check that we have /mnt/overlay fs mounted as tmpfs and
|
||||
# /usr/share/my-application as an overlay (see overlayfs-user recipe)
|
||||
status, output = qemu.run_serial("/bin/mount -t tmpfs,overlay")
|
||||
|
||||
line = getline_qemu(output, "on /mnt/overlay")
|
||||
line = self.getline_qemu(output, "on /mnt/overlay")
|
||||
self.assertTrue(line and line.startswith("tmpfs"), msg=output)
|
||||
|
||||
line = getline_qemu(output, "upperdir=/mnt/overlay/upper/usr/share/my-application")
|
||||
line = self.getline_qemu(output, "upperdir=/mnt/overlay/upper/usr/share/my-application")
|
||||
self.assertTrue(line and line.startswith("overlay"), msg=output)
|
||||
|
||||
Reference in New Issue
Block a user