summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJose Perez Carranza <jose.perez.carranza@linux.intel.com>2017-01-30 07:48:09 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:45 +0000
commit383fc7df3149d49a9a25e1e2e47f1c6b580e6773 (patch)
tree2b2e65ed713ea257581494f0b538d9a9bf501010 /meta
parent42eace0770242b5aa716f87f5f0af3a4fe3c3e29 (diff)
downloadpoky-383fc7df3149d49a9a25e1e2e47f1c6b580e6773.tar.gz
selftest/runtime-tests: Modify positins test to reduce execution time
Currently test_postinst_roofs_and_boot is building a full-cmdline image this is taking a lot of time to execute the test, so a minimal image will be build instead. (From OE-Core rev: 3a6b0b9f94b7097a825edf3fe258a2f86b73edd6) Signed-off-by: Jose Perez Carranza <jose.perez.carranza@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/runtime-test.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py
index 9e2ecc60f9..52e5b27858 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -176,7 +176,7 @@ postinst-delayed-t \
176 that script can be delayed to run at first boot. 176 that script can be delayed to run at first boot.
177 Dependencies: NA 177 Dependencies: NA
178 Steps: 1. Add proper configuration to local.conf file 178 Steps: 1. Add proper configuration to local.conf file
179 2. Build a "core-image-full-cmdline" image 179 2. Build a "core-image-minimal" image
180 3. Verify that file created by postinst_rootfs recipe is 180 3. Verify that file created by postinst_rootfs recipe is
181 present on rootfs dir. 181 present on rootfs dir.
182 4. Boot the image created on qemu and verify that the file 182 4. Boot the image created on qemu and verify that the file
@@ -195,6 +195,7 @@ postinst-delayed-t \
195 #Step 1 195 #Step 1
196 features = 'MACHINE = "qemux86"\n' 196 features = 'MACHINE = "qemux86"\n'
197 features += 'CORE_IMAGE_EXTRA_INSTALL += "%s %s "\n'% (rootfs_pkg, boot_pkg) 197 features += 'CORE_IMAGE_EXTRA_INSTALL += "%s %s "\n'% (rootfs_pkg, boot_pkg)
198 features += 'IMAGE_FEATURES += "ssh-server-openssh"\n'
198 for init_manager in ("sysvinit", "systemd"): 199 for init_manager in ("sysvinit", "systemd"):
199 #for sysvinit no extra configuration is needed, 200 #for sysvinit no extra configuration is needed,
200 if (init_manager is "systemd"): 201 if (init_manager is "systemd"):
@@ -209,10 +210,10 @@ postinst-delayed-t \
209 self.write_config(features) 210 self.write_config(features)
210 211
211 #Step 2 212 #Step 2
212 bitbake('core-image-full-cmdline') 213 bitbake('core-image-minimal')
213 214
214 #Step 3 215 #Step 3
215 file_rootfs_created = os.path.join(get_bb_var('IMAGE_ROOTFS',"core-image-full-cmdline"), 216 file_rootfs_created = os.path.join(get_bb_var('IMAGE_ROOTFS',"core-image-minimal"),
216 file_rootfs_name) 217 file_rootfs_name)
217 found = os.path.isfile(file_rootfs_created) 218 found = os.path.isfile(file_rootfs_created)
218 self.assertTrue(found, "File %s was not created at rootfs time by %s" % \ 219 self.assertTrue(found, "File %s was not created at rootfs time by %s" % \
@@ -220,11 +221,11 @@ postinst-delayed-t \
220 221
221 #Step 4 222 #Step 4
222 testcommand = 'ls /etc/'+fileboot_name 223 testcommand = 'ls /etc/'+fileboot_name
223 with runqemu('core-image-full-cmdline') as qemu: 224 with runqemu('core-image-minimal') as qemu:
224 sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' 225 sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
225 result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand)) 226 result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand))
226 self.assertEqual(result.status, 0, 'File %s was not created at firts boot'% fileboot_name) 227 self.assertEqual(result.status, 0, 'File %s was not created at firts boot'% fileboot_name)
227 228
228 #Step 5 229 #Step 5
229 bitbake(' %s %s -c cleanall' % (rootfs_pkg, boot_pkg)) 230 bitbake(' %s %s -c cleanall' % (rootfs_pkg, boot_pkg))
230 bitbake('core-image-full-cmdline -c cleanall') 231 bitbake('core-image-minimal -c cleanall')