diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/runqemu.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index e72dc1036e..d3eeee3b41 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py | |||
@@ -65,7 +65,8 @@ SYSLINUX_TIMEOUT = "10" | |||
65 | cmd = "%s %s iso" % (self.cmd_common, self.machine) | 65 | cmd = "%s %s iso" % (self.cmd_common, self.machine) |
66 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 66 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
67 | with open(qemu.qemurunnerlog) as f: | 67 | with open(qemu.qemurunnerlog) as f: |
68 | self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) | 68 | text_in = 'media=cdrom' |
69 | self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) | ||
69 | 70 | ||
70 | def test_boot_recipe_image(self): | 71 | def test_boot_recipe_image(self): |
71 | """Test runqemu recipe-image""" | 72 | """Test runqemu recipe-image""" |
@@ -80,14 +81,16 @@ SYSLINUX_TIMEOUT = "10" | |||
80 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) | 81 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) |
81 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 82 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
82 | with open(qemu.qemurunnerlog) as f: | 83 | with open(qemu.qemurunnerlog) as f: |
83 | self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) | 84 | text_in = 'format=vmdk' |
85 | self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) | ||
84 | 86 | ||
85 | def test_boot_recipe_image_vdi(self): | 87 | def test_boot_recipe_image_vdi(self): |
86 | """Test runqemu recipe-image vdi""" | 88 | """Test runqemu recipe-image vdi""" |
87 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) | 89 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) |
88 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 90 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
89 | with open(qemu.qemurunnerlog) as f: | 91 | with open(qemu.qemurunnerlog) as f: |
90 | self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) | 92 | text_in = 'format=vdi' |
93 | self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) | ||
91 | 94 | ||
92 | def test_boot_deploy(self): | 95 | def test_boot_deploy(self): |
93 | """Test runqemu deploy_dir_image""" | 96 | """Test runqemu deploy_dir_image""" |