summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-04-11 02:21:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-12 15:09:57 +0100
commit620655697d5d55200d2565b4f94ab26407d15b94 (patch)
tree61a8643fb6261eba5e62bb7e4d3ac70d62a6f31d /meta/lib/oeqa
parent8838dd2dbd7ff2a3c93e0bdc6d8b181ee8079c3f (diff)
downloadpoky-620655697d5d55200d2565b4f94ab26407d15b94.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. (From OE-Core rev: a722016df3f452f7a870157a99a1abb7d97d8280) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/wic.py6
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
614 cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" 614 cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '"
615 status, output = qemu.run_serial(cmd) 615 status, output = qemu.run_serial(cmd)
616 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) 616 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
617 self.assertEqual(output, '/dev/root /\r\n/dev/vda3 /mnt') 617 self.assertEqual(output, '/dev/root /\r\n/dev/sda3 /mnt')
618 618
619 @only_for_arch(['i586', 'i686', 'x86_64']) 619 @only_for_arch(['i586', 'i686', 'x86_64'])
620 def test_qemu_efi(self): 620 def test_qemu_efi(self):
@@ -626,7 +626,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r
626 626
627 with runqemu('core-image-minimal', ssh=False, 627 with runqemu('core-image-minimal', ssh=False,
628 runqemuparams='ovmf', image_fstype='wic') as qemu: 628 runqemuparams='ovmf', image_fstype='wic') as qemu:
629 cmd = "grep vda. /proc/partitions |wc -l" 629 cmd = "grep sda. /proc/partitions |wc -l"
630 status, output = qemu.run_serial(cmd) 630 status, output = qemu.run_serial(cmd)
631 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) 631 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
632 self.assertEqual(output, '3') 632 self.assertEqual(output, '3')
@@ -701,7 +701,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r
701 self.remove_config(config) 701 self.remove_config(config)
702 702
703 with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu: 703 with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu:
704 cmd = "grep vda. /proc/partitions |wc -l" 704 cmd = "grep sda. /proc/partitions |wc -l"
705 status, output = qemu.run_serial(cmd) 705 status, output = qemu.run_serial(cmd)
706 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) 706 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
707 self.assertEqual(output, '2') 707 self.assertEqual(output, '2')