]> code.ossystems Code Review - openembedded-core.git/commitdiff
selftest/runtime-tests: Modify positins test to reduce execution time
authorJose Perez Carranza <jose.perez.carranza@linux.intel.com>
Mon, 30 Jan 2017 13:48:09 +0000 (07:48 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Feb 2017 17:37:36 +0000 (17:37 +0000)
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.

Signed-off-by: Jose Perez Carranza <jose.perez.carranza@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/lib/oeqa/selftest/runtime-test.py

index 9e2ecc60f9893cf2038f44bc945ea9477b0fff16..52e5b2785804d9c35794fc37ec8021c1f30eb818 100644 (file)
@@ -176,7 +176,7 @@ postinst-delayed-t \
                         that script can be delayed to run at first boot.
         Dependencies:   NA
         Steps:          1. Add proper configuration to local.conf file
-                        2. Build a "core-image-full-cmdline" image
+                        2. Build a "core-image-minimal" image
                         3. Verify that file created by postinst_rootfs recipe is
                            present on rootfs dir.
                         4. Boot the image created on qemu and verify that the file
@@ -195,6 +195,7 @@ postinst-delayed-t \
         #Step 1
         features = 'MACHINE = "qemux86"\n'
         features += 'CORE_IMAGE_EXTRA_INSTALL += "%s %s "\n'% (rootfs_pkg, boot_pkg)
+        features += 'IMAGE_FEATURES += "ssh-server-openssh"\n'
         for init_manager in ("sysvinit", "systemd"):
             #for sysvinit no extra configuration is needed,
             if (init_manager is "systemd"):
@@ -209,10 +210,10 @@ postinst-delayed-t \
                 self.write_config(features)
 
                 #Step 2
-                bitbake('core-image-full-cmdline')
+                bitbake('core-image-minimal')
 
                 #Step 3
-                file_rootfs_created = os.path.join(get_bb_var('IMAGE_ROOTFS',"core-image-full-cmdline"),
+                file_rootfs_created = os.path.join(get_bb_var('IMAGE_ROOTFS',"core-image-minimal"),
                                                    file_rootfs_name)
                 found = os.path.isfile(file_rootfs_created)
                 self.assertTrue(found, "File %s was not created at rootfs time by %s" % \
@@ -220,11 +221,11 @@ postinst-delayed-t \
 
                 #Step 4
                 testcommand = 'ls /etc/'+fileboot_name
-                with runqemu('core-image-full-cmdline') as qemu:
+                with runqemu('core-image-minimal') as qemu:
                     sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
                     result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand))
                     self.assertEqual(result.status, 0, 'File %s was not created at firts boot'% fileboot_name)
 
                 #Step 5
                 bitbake(' %s %s -c cleanall' % (rootfs_pkg, boot_pkg))
-                bitbake('core-image-full-cmdline -c cleanall')
+                bitbake('core-image-minimal -c cleanall')