diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index edc2e424e6..4e35bb97e3 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py | |||
@@ -42,7 +42,8 @@ SYSLINUX_TIMEOUT = "10" | |||
42 | """Test runqemu machine""" | 42 | """Test runqemu machine""" |
43 | cmd = "%s %s" % (self.cmd_common, self.machine) | 43 | cmd = "%s %s" % (self.cmd_common, self.machine) |
44 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 44 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
45 | self.assertTrue(qemu.runner.logged, "Failed: %s" % cmd) | 45 | with open(qemu.qemurunnerlog) as f: |
46 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | ||
46 | 47 | ||
47 | @OETestID(2002) | 48 | @OETestID(2002) |
48 | def test_boot_machine_ext4(self): | 49 | def test_boot_machine_ext4(self): |
@@ -50,7 +51,7 @@ SYSLINUX_TIMEOUT = "10" | |||
50 | cmd = "%s %s ext4" % (self.cmd_common, self.machine) | 51 | cmd = "%s %s ext4" % (self.cmd_common, self.machine) |
51 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 52 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
52 | with open(qemu.qemurunnerlog) as f: | 53 | with open(qemu.qemurunnerlog) as f: |
53 | self.assertTrue('rootfs.ext4' in f.read(), "Failed: %s" % cmd) | 54 | self.assertIn('rootfs.ext4', f.read(), "Failed: %s" % cmd) |
54 | 55 | ||
55 | @OETestID(2003) | 56 | @OETestID(2003) |
56 | def test_boot_machine_iso(self): | 57 | def test_boot_machine_iso(self): |
@@ -58,14 +59,16 @@ SYSLINUX_TIMEOUT = "10" | |||
58 | cmd = "%s %s iso" % (self.cmd_common, self.machine) | 59 | cmd = "%s %s iso" % (self.cmd_common, self.machine) |
59 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 60 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
60 | with open(qemu.qemurunnerlog) as f: | 61 | with open(qemu.qemurunnerlog) as f: |
61 | self.assertTrue('media=cdrom' in f.read(), "Failed: %s" % cmd) | 62 | self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) |
62 | 63 | ||
63 | @OETestID(2004) | 64 | @OETestID(2004) |
64 | def test_boot_recipe_image(self): | 65 | def test_boot_recipe_image(self): |
65 | """Test runqemu recipe-image""" | 66 | """Test runqemu recipe-image""" |
66 | cmd = "%s %s" % (self.cmd_common, self.recipe) | 67 | cmd = "%s %s" % (self.cmd_common, self.recipe) |
67 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 68 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
68 | self.assertTrue(qemu.runner.logged, "Failed: %s" % cmd) | 69 | with open(qemu.qemurunnerlog) as f: |
70 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | ||
71 | |||
69 | 72 | ||
70 | @OETestID(2005) | 73 | @OETestID(2005) |
71 | def test_boot_recipe_image_vmdk(self): | 74 | def test_boot_recipe_image_vmdk(self): |
@@ -73,7 +76,7 @@ SYSLINUX_TIMEOUT = "10" | |||
73 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) | 76 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) |
74 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 77 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
75 | with open(qemu.qemurunnerlog) as f: | 78 | with open(qemu.qemurunnerlog) as f: |
76 | self.assertTrue('format=vmdk' in f.read(), "Failed: %s" % cmd) | 79 | self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) |
77 | 80 | ||
78 | @OETestID(2006) | 81 | @OETestID(2006) |
79 | def test_boot_recipe_image_vdi(self): | 82 | def test_boot_recipe_image_vdi(self): |
@@ -81,14 +84,16 @@ SYSLINUX_TIMEOUT = "10" | |||
81 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) | 84 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) |
82 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 85 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
83 | with open(qemu.qemurunnerlog) as f: | 86 | with open(qemu.qemurunnerlog) as f: |
84 | self.assertTrue('format=vdi' in f.read(), "Failed: %s" % cmd) | 87 | self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) |
85 | 88 | ||
86 | @OETestID(2007) | 89 | @OETestID(2007) |
87 | def test_boot_deploy(self): | 90 | def test_boot_deploy(self): |
88 | """Test runqemu deploy_dir_image""" | 91 | """Test runqemu deploy_dir_image""" |
89 | cmd = "%s %s" % (self.cmd_common, self.deploy_dir_image) | 92 | cmd = "%s %s" % (self.cmd_common, self.deploy_dir_image) |
90 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 93 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
91 | self.assertTrue(qemu.runner.logged, "Failed: %s" % cmd) | 94 | with open(qemu.qemurunnerlog) as f: |
95 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | ||
96 | |||
92 | 97 | ||
93 | @OETestID(2008) | 98 | @OETestID(2008) |
94 | def test_boot_deploy_hddimg(self): | 99 | def test_boot_deploy_hddimg(self): |
@@ -96,7 +101,7 @@ SYSLINUX_TIMEOUT = "10" | |||
96 | cmd = "%s %s hddimg" % (self.cmd_common, self.deploy_dir_image) | 101 | cmd = "%s %s hddimg" % (self.cmd_common, self.deploy_dir_image) |
97 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 102 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
98 | with open(qemu.qemurunnerlog) as f: | 103 | with open(qemu.qemurunnerlog) as f: |
99 | self.assertTrue(re.search('file=.*.hddimg', f.read()), "Failed: %s" % cmd) | 104 | self.assertTrue(re.search('file=.*.hddimg', f.read()), "Failed: %s, %s" % (cmd, f.read())) |
100 | 105 | ||
101 | @OETestID(2009) | 106 | @OETestID(2009) |
102 | def test_boot_machine_slirp(self): | 107 | def test_boot_machine_slirp(self): |
@@ -104,7 +109,7 @@ SYSLINUX_TIMEOUT = "10" | |||
104 | cmd = "%s slirp %s" % (self.cmd_common, self.machine) | 109 | cmd = "%s slirp %s" % (self.cmd_common, self.machine) |
105 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 110 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
106 | with open(qemu.qemurunnerlog) as f: | 111 | with open(qemu.qemurunnerlog) as f: |
107 | self.assertTrue(' -netdev user' in f.read(), "Failed: %s" % cmd) | 112 | self.assertIn(' -netdev user', f.read(), "Failed: %s" % cmd) |
108 | 113 | ||
109 | @OETestID(2009) | 114 | @OETestID(2009) |
110 | def test_boot_machine_slirp_qcow2(self): | 115 | def test_boot_machine_slirp_qcow2(self): |
@@ -112,7 +117,7 @@ SYSLINUX_TIMEOUT = "10" | |||
112 | cmd = "%s slirp wic.qcow2 %s" % (self.cmd_common, self.machine) | 117 | cmd = "%s slirp wic.qcow2 %s" % (self.cmd_common, self.machine) |
113 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 118 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
114 | with open(qemu.qemurunnerlog) as f: | 119 | with open(qemu.qemurunnerlog) as f: |
115 | self.assertTrue('format=qcow2' in f.read(), "Failed: %s" % cmd) | 120 | self.assertIn('format=qcow2', f.read(), "Failed: %s" % cmd) |
116 | 121 | ||
117 | @OETestID(2010) | 122 | @OETestID(2010) |
118 | def test_boot_qemu_boot(self): | 123 | def test_boot_qemu_boot(self): |
@@ -123,7 +128,8 @@ SYSLINUX_TIMEOUT = "10" | |||
123 | self.skipTest("%s not found" % qemuboot_conf) | 128 | self.skipTest("%s not found" % qemuboot_conf) |
124 | cmd = "%s %s" % (self.cmd_common, qemuboot_conf) | 129 | cmd = "%s %s" % (self.cmd_common, qemuboot_conf) |
125 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 130 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
126 | self.assertTrue(qemu.runner.logged, "Failed: %s" % cmd) | 131 | with open(qemu.qemurunnerlog) as f: |
132 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | ||
127 | 133 | ||
128 | @OETestID(2011) | 134 | @OETestID(2011) |
129 | def test_boot_rootfs(self): | 135 | def test_boot_rootfs(self): |
@@ -134,7 +140,9 @@ SYSLINUX_TIMEOUT = "10" | |||
134 | self.skipTest("%s not found" % rootfs) | 140 | self.skipTest("%s not found" % rootfs) |
135 | cmd = "%s %s" % (self.cmd_common, rootfs) | 141 | cmd = "%s %s" % (self.cmd_common, rootfs) |
136 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 142 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
137 | self.assertTrue(qemu.runner.logged, "Failed: %s" % cmd) | 143 | with open(qemu.qemurunnerlog) as f: |
144 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | ||
145 | |||
138 | 146 | ||
139 | # This test was designed as a separate class to test that shutdown | 147 | # This test was designed as a separate class to test that shutdown |
140 | # command will shutdown qemu as expected on each qemu architecture | 148 | # command will shutdown qemu as expected on each qemu architecture |