diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-01-16 15:45:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:39 +0000 |
commit | b023be77142e928beec3ec37176e9246aeb10689 (patch) | |
tree | b6e0892bf9e4eb1d0605e9f96e7fc2e089bbf8a7 /meta/lib | |
parent | a9b4266f62393c8ab428450ef04e927e6cac1179 (diff) | |
download | poky-b023be77142e928beec3ec37176e9246aeb10689.tar.gz |
selftest/wic: update test case test_qemu
This test case boots the image in qemu and checks for mounted partitions.
But the outputs of mount are different between sysvinit and systemd:
sysvinit:
/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt
systemd:
/dev/sda1 /boot\r\n/dev/sda2 /\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt
So check mounted partitions by egrep rather than check output of runqemu.
(From OE-Core rev: 8e3311d45ec68d74e934e966f67cf5102634981c)
(From OE-Core rev: 828db9026c61d0a6ad12b8e05929eef31abfd57d)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 36ee5e5a14..79925f942f 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py | |||
@@ -625,9 +625,11 @@ class Wic2(WicTestCase): | |||
625 | self.remove_config(config) | 625 | self.remove_config(config) |
626 | 626 | ||
627 | with runqemu('wic-image-minimal', ssh=False) as qemu: | 627 | with runqemu('wic-image-minimal', ssh=False) as qemu: |
628 | cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' ' | sort" | 628 | cmd = "mount | grep '^/dev/' | cut -f1,3 -d ' ' | egrep -c -e '/dev/sda1 /boot' " \ |
629 | "-e '/dev/root /|/dev/sda2 /' -e '/dev/sda3 /media' -e '/dev/sda4 /mnt'" | ||
629 | status, output = qemu.run_serial(cmd) | 630 | status, output = qemu.run_serial(cmd) |
630 | self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt') | 631 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) |
632 | self.assertEqual(output, '4') | ||
631 | cmd = "grep UUID= /etc/fstab" | 633 | cmd = "grep UUID= /etc/fstab" |
632 | status, output = qemu.run_serial(cmd) | 634 | status, output = qemu.run_serial(cmd) |
633 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) | 635 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) |