diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/overlayfs.py')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/overlayfs.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py index 0184d52494..f0c9860b48 100644 --- a/meta/lib/oeqa/selftest/cases/overlayfs.py +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py @@ -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) |