diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-13 22:20:26 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:00:25 +0000 |
| commit | 6d9396b26218f3234701944f385d5c36face8121 (patch) | |
| tree | e685412d61c7703ba1788b4daf37d488031c204f | |
| parent | 9256b8799495634ee8aee5d16ff71bd6e6e25ed4 (diff) | |
| download | openembedded-core-6d9396b26218f3234701944f385d5c36face8121.tar.gz openembedded-core-6d9396b26218f3234701944f385d5c36face8121.tar.bz2 openembedded-core-6d9396b26218f3234701944f385d5c36face8121.zip | |
meta-selftest: wic: Add test for --use-uuid / --fsuuid
- Mount a '/media' partition to wic-image-minimal.wks with a known UUID.
- In test_qemu, sort our output from checking the output of 'mount' as
it may not be stable. Also, do not check the exit code as passing any
output to cut ensures a 0 exit code.
- Check for a 'UUID=' line in /etc/fstab with out expected output.
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.wks | 1 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/meta-selftest/recipes-test/images/wic-image-minimal.wks index 9410b684be..ae69cb6e3c 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.wks +++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks @@ -4,6 +4,7 @@ part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid +part /media --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label uuid-test --align 1024 --use-uuid --fsuuid 2c71ef06-a81d-4735-9d3a-379b69c6bdba part /mnt --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 651d575dc3..ccbc82ed9b 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -634,10 +634,13 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r self.remove_config(config) with runqemu('wic-image-minimal', ssh=False) as qemu: - cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" + cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' ' | sort" + status, output = qemu.run_serial(cmd) + self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt') + cmd = "grep UUID= /etc/fstab" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) - self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /mnt') + self.assertEqual(output, 'UUID=2c71ef06-a81d-4735-9d3a-379b69c6bdba\t/media\text4\tdefaults\t0\t0') @only_for_arch(['i586', 'i686', 'x86_64']) @OETestID(1852) |