summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oeqa/selftest/cases/runqemu.py9
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 3f8760a5ba..f01e1eec66 100644
--- a/meta/lib/oeqa/selftest/cases/runqemu.py
+++ b/meta/lib/oeqa/selftest/cases/runqemu.py
@@ -71,7 +71,8 @@ SYSLINUX_TIMEOUT = "10"
71 cmd = "%s %s iso" % (self.cmd_common, self.machine) 71 cmd = "%s %s iso" % (self.cmd_common, self.machine)
72 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: 72 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu:
73 with open(qemu.qemurunnerlog) as f: 73 with open(qemu.qemurunnerlog) as f:
74 self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) 74 text_in = 'media=cdrom'
75 self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd))
75 76
76 def test_boot_recipe_image(self): 77 def test_boot_recipe_image(self):
77 """Test runqemu recipe-image""" 78 """Test runqemu recipe-image"""
@@ -87,7 +88,8 @@ SYSLINUX_TIMEOUT = "10"
87 cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) 88 cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe)
88 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: 89 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu:
89 with open(qemu.qemurunnerlog) as f: 90 with open(qemu.qemurunnerlog) as f:
90 self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) 91 text_in = 'format=vmdk'
92 self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd))
91 93
92 @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently") 94 @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently")
93 def test_boot_recipe_image_vdi(self): 95 def test_boot_recipe_image_vdi(self):
@@ -95,7 +97,8 @@ SYSLINUX_TIMEOUT = "10"
95 cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) 97 cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe)
96 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: 98 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu:
97 with open(qemu.qemurunnerlog) as f: 99 with open(qemu.qemurunnerlog) as f:
98 self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) 100 text_in = 'format=vdi'
101 self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd))
99 102
100 def test_boot_deploy(self): 103 def test_boot_deploy(self):
101 """Test runqemu deploy_dir_image""" 104 """Test runqemu deploy_dir_image"""