diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2017-04-11 02:21:29 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-11 18:10:49 +0100 |
| commit | a722016df3f452f7a870157a99a1abb7d97d8280 (patch) | |
| tree | 4779dd104c0c87ea5f539fa8d17278707f907078 | |
| parent | 88701cef6ba399e82f96ed1b0eef9a44ed8c1687 (diff) | |
| download | openembedded-core-contrib-a722016df3f452f7a870157a99a1abb7d97d8280.tar.gz | |
selftest/wic.py: vda -> sda
Previously, runqemu grep root=/dev/sd or root=/dev/hd on the image, and
would use vda if no grep result, now we have set QB_DRIVE_TYPE to
"/dev/sd" by default, and the device will be /dev/sda, so use sda to
replace vda in the test case.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index c1ff512f81..726af19e9d 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -614,7 +614,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" 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/vda3 /mnt') + self.assertEqual(output, '/dev/root /\r\n/dev/sda3 /mnt') @only_for_arch(['i586', 'i686', 'x86_64']) def test_qemu_efi(self): @@ -626,7 +626,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r with runqemu('core-image-minimal', ssh=False, runqemuparams='ovmf', image_fstype='wic') as qemu: - cmd = "grep vda. /proc/partitions |wc -l" + cmd = "grep sda. /proc/partitions |wc -l" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) self.assertEqual(output, '3') @@ -701,7 +701,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r self.remove_config(config) with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu: - cmd = "grep vda. /proc/partitions |wc -l" + cmd = "grep sda. /proc/partitions |wc -l" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) self.assertEqual(output, '2') |