summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index a021f8d84b..6f3dc27743 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -851,7 +851,7 @@ class Wic2(WicTestCase):
851 self.assertEqual(0, bitbake('wic-image-minimal').status) 851 self.assertEqual(0, bitbake('wic-image-minimal').status)
852 self.remove_config(config) 852 self.remove_config(config)
853 853
854 with runqemu('wic-image-minimal', ssh=False) as qemu: 854 with runqemu('wic-image-minimal', ssh=False, runqemuparams='nographic') as qemu:
855 cmd = "mount | grep '^/dev/' | cut -f1,3 -d ' ' | egrep -c -e '/dev/sda1 /boot' " \ 855 cmd = "mount | grep '^/dev/' | cut -f1,3 -d ' ' | egrep -c -e '/dev/sda1 /boot' " \
856 "-e '/dev/root /|/dev/sda2 /' -e '/dev/sda3 /media' -e '/dev/sda4 /mnt'" 856 "-e '/dev/root /|/dev/sda2 /' -e '/dev/sda3 /media' -e '/dev/sda4 /mnt'"
857 status, output = qemu.run_serial(cmd) 857 status, output = qemu.run_serial(cmd)
@@ -871,7 +871,7 @@ class Wic2(WicTestCase):
871 self.remove_config(config) 871 self.remove_config(config)
872 872
873 with runqemu('core-image-minimal', ssh=False, 873 with runqemu('core-image-minimal', ssh=False,
874 runqemuparams='ovmf', image_fstype='wic') as qemu: 874 runqemuparams='nographic ovmf', image_fstype='wic') as qemu:
875 cmd = "grep sda. /proc/partitions |wc -l" 875 cmd = "grep sda. /proc/partitions |wc -l"
876 status, output = qemu.run_serial(cmd) 876 status, output = qemu.run_serial(cmd)
877 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) 877 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
@@ -1059,7 +1059,8 @@ class Wic2(WicTestCase):
1059 self.assertEqual(0, bitbake('core-image-minimal-mtdutils').status) 1059 self.assertEqual(0, bitbake('core-image-minimal-mtdutils').status)
1060 self.remove_config(config) 1060 self.remove_config(config)
1061 1061
1062 with runqemu('core-image-minimal-mtdutils', ssh=False, image_fstype='wic') as qemu: 1062 with runqemu('core-image-minimal-mtdutils', ssh=False,
1063 runqemuparams='nographic', image_fstype='wic') as qemu:
1063 cmd = "grep sda. /proc/partitions |wc -l" 1064 cmd = "grep sda. /proc/partitions |wc -l"
1064 status, output = qemu.run_serial(cmd) 1065 status, output = qemu.run_serial(cmd)
1065 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) 1066 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
@@ -1119,7 +1120,8 @@ class Wic2(WicTestCase):
1119 self.assertEqual(0, bitbake('core-image-minimal').status) 1120 self.assertEqual(0, bitbake('core-image-minimal').status)
1120 self.remove_config(config) 1121 self.remove_config(config)
1121 1122
1122 with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu: 1123 with runqemu('core-image-minimal', ssh=False,
1124 runqemuparams='nographic', image_fstype='wic') as qemu:
1123 # Check that we have ONLY two /dev/sda* partitions (/boot and /) 1125 # Check that we have ONLY two /dev/sda* partitions (/boot and /)
1124 cmd = "grep sda. /proc/partitions | wc -l" 1126 cmd = "grep sda. /proc/partitions | wc -l"
1125 status, output = qemu.run_serial(cmd) 1127 status, output = qemu.run_serial(cmd)
@@ -1180,7 +1182,7 @@ class Wic2(WicTestCase):
1180 self.remove_config(config) 1182 self.remove_config(config)
1181 1183
1182 with runqemu('core-image-minimal', ssh=False, 1184 with runqemu('core-image-minimal', ssh=False,
1183 runqemuparams='ovmf', image_fstype='wic') as qemu: 1185 runqemuparams='nographic ovmf', image_fstype='wic') as qemu:
1184 # Check that /boot has EFI bootx64.efi (required for EFI) 1186 # Check that /boot has EFI bootx64.efi (required for EFI)
1185 cmd = "ls /boot/EFI/BOOT/bootx64.efi | wc -l" 1187 cmd = "ls /boot/EFI/BOOT/bootx64.efi | wc -l"
1186 status, output = qemu.run_serial(cmd) 1188 status, output = qemu.run_serial(cmd)
@@ -1418,7 +1420,7 @@ class Wic2(WicTestCase):
1418 bb.utils.rename(new_image_path, image_path) 1420 bb.utils.rename(new_image_path, image_path)
1419 1421
1420 # Check if it boots in qemu 1422 # Check if it boots in qemu
1421 with runqemu('core-image-minimal', ssh=False) as qemu: 1423 with runqemu('core-image-minimal', ssh=False, runqemuparams='nographic') as qemu:
1422 cmd = "ls /etc/" 1424 cmd = "ls /etc/"
1423 status, output = qemu.run_serial('true') 1425 status, output = qemu.run_serial('true')
1424 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) 1426 self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))