diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 4050a4123b..8805a3837e 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py | |||
@@ -19,7 +19,7 @@ class RunqemuTests(OESelftestTestCase): | |||
19 | super(RunqemuTests, self).setUpLocal() | 19 | super(RunqemuTests, self).setUpLocal() |
20 | self.recipe = 'core-image-minimal' | 20 | self.recipe = 'core-image-minimal' |
21 | self.machine = 'qemux86-64' | 21 | self.machine = 'qemux86-64' |
22 | self.fstypes = "ext4 iso hddimg vmdk qcow2 vdi" | 22 | self.fstypes = "ext4 iso hddimg wic.vmdk wic.qcow2 wic.vdi" |
23 | self.cmd_common = "runqemu nographic" | 23 | self.cmd_common = "runqemu nographic" |
24 | 24 | ||
25 | # Avoid emit the same record multiple times. | 25 | # Avoid emit the same record multiple times. |
@@ -74,7 +74,7 @@ SYSLINUX_TIMEOUT = "10" | |||
74 | @OETestID(2005) | 74 | @OETestID(2005) |
75 | def test_boot_recipe_image_vmdk(self): | 75 | def test_boot_recipe_image_vmdk(self): |
76 | """Test runqemu recipe-image vmdk""" | 76 | """Test runqemu recipe-image vmdk""" |
77 | cmd = "%s %s vmdk" % (self.cmd_common, self.recipe) | 77 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) |
78 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 78 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
79 | with open(qemu.qemurunnerlog) as f: | 79 | with open(qemu.qemurunnerlog) as f: |
80 | self.assertTrue('format=vmdk' in f.read(), "Failed: %s" % cmd) | 80 | self.assertTrue('format=vmdk' in f.read(), "Failed: %s" % cmd) |
@@ -82,7 +82,7 @@ SYSLINUX_TIMEOUT = "10" | |||
82 | @OETestID(2006) | 82 | @OETestID(2006) |
83 | def test_boot_recipe_image_vdi(self): | 83 | def test_boot_recipe_image_vdi(self): |
84 | """Test runqemu recipe-image vdi""" | 84 | """Test runqemu recipe-image vdi""" |
85 | cmd = "%s %s vdi" % (self.cmd_common, self.recipe) | 85 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) |
86 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 86 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
87 | with open(qemu.qemurunnerlog) as f: | 87 | with open(qemu.qemurunnerlog) as f: |
88 | self.assertTrue('format=vdi' in f.read(), "Failed: %s" % cmd) | 88 | self.assertTrue('format=vdi' in f.read(), "Failed: %s" % cmd) |
@@ -113,7 +113,7 @@ SYSLINUX_TIMEOUT = "10" | |||
113 | @OETestID(2009) | 113 | @OETestID(2009) |
114 | def test_boot_machine_slirp_qcow2(self): | 114 | def test_boot_machine_slirp_qcow2(self): |
115 | """Test runqemu machine slirp qcow2""" | 115 | """Test runqemu machine slirp qcow2""" |
116 | cmd = "%s slirp qcow2 %s" % (self.cmd_common, self.machine) | 116 | cmd = "%s slirp wic.qcow2 %s" % (self.cmd_common, self.machine) |
117 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 117 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
118 | with open(qemu.qemurunnerlog) as f: | 118 | with open(qemu.qemurunnerlog) as f: |
119 | self.assertTrue('format=qcow2' in f.read(), "Failed: %s" % cmd) | 119 | self.assertTrue('format=qcow2' in f.read(), "Failed: %s" % cmd) |