From 6dcbe845050449dbd4faffcaf7951417400007cb Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Fri, 26 May 2017 09:02:04 -0700 Subject: selftest: Migrate systemd_boot test case to the new framework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - systemd_boot.py: Use the new case class and change decorator for id - __init__.py: Because isn't needed now (From meta-yocto rev: 59b2135007d80b3b76ef1256bf5d5aa6076178bc) Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- meta-yocto-bsp/lib/oeqa/selftest/__init__.py | 0 .../lib/oeqa/selftest/cases/systemd_boot.py | 52 ++++++++++++++++++++ meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py | 56 ---------------------- 3 files changed, 52 insertions(+), 56 deletions(-) delete mode 100644 meta-yocto-bsp/lib/oeqa/selftest/__init__.py create mode 100644 meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py delete mode 100644 meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py (limited to 'meta-yocto-bsp') diff --git a/meta-yocto-bsp/lib/oeqa/selftest/__init__.py b/meta-yocto-bsp/lib/oeqa/selftest/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py new file mode 100644 index 0000000000..848cdf7852 --- /dev/null +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py @@ -0,0 +1,52 @@ +import os + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.core.decorator.oeid import OETestID +from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu + +class Systemdboot(OESelftestTestCase): + def _common_setup(self): + """ + Common setup for test cases: 1445, XXXX + """ + + # Set EFI_PROVIDER = "gummiboot" and MACHINE = "genericx86-64" in conf/local.conf + features = 'EFI_PROVIDER = "systemd-boot"\n' + features += 'MACHINE = "genericx86-64"' + self.append_config(features) + + def _common_build(self): + """ + Common build for test cases: 1445 , XXXX + """ + + # Build a genericx86-64/efi gummiboot image + bitbake('mtools-native core-image-minimal') + + + @OETestID(1445) + def test_efi_systemdboot_images_can_be_built(self): + """ + Summary: Check if systemd-boot images can be built correctly + Expected: 1. File systemd-boot.efi should be available in $poky/build/tmp/deploy/images/genericx86-64 + 2. 'systemd-boot" can be built correctly + Product: oe-core + Author: Jose Perez Carranza + AutomatedBy: Jose Perez Carranza + """ + + # We'd use DEPLOY_DIR_IMAGE here, except that we need its value for + # MACHINE="genericx86-64 which is probably not the one configured + systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'systemd-bootx64.efi') + + self._common_setup() + + # Ensure we're actually testing that this gets built and not that + # it was around from an earlier build + bitbake('-c cleansstate systemd-boot') + runCmd('rm -f %s' % systemdbootfile) + + self._common_build() + + found = os.path.isfile(systemdbootfile) + self.assertTrue(found, 'Systemd-Boot file %s not found' % systemdbootfile) diff --git a/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py deleted file mode 100644 index f7f74db7e2..0000000000 --- a/meta-yocto-bsp/lib/oeqa/selftest/systemd_boot.py +++ /dev/null @@ -1,56 +0,0 @@ -from oeqa.selftest.base import oeSelfTest -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu -from oeqa.utils.decorators import testcase -import re -import os -import sys -import logging - - -class Systemdboot(oeSelfTest): - - def _common_setup(self): - """ - Common setup for test cases: 1445, XXXX - """ - - # Set EFI_PROVIDER = "gummiboot" and MACHINE = "genericx86-64" in conf/local.conf - features = 'EFI_PROVIDER = "systemd-boot"\n' - features += 'MACHINE = "genericx86-64"' - self.append_config(features) - - def _common_build(self): - """ - Common build for test cases: 1445 , XXXX - """ - - # Build a genericx86-64/efi gummiboot image - bitbake('mtools-native core-image-minimal') - - - @testcase(1445) - def test_efi_systemdboot_images_can_be_built(self): - """ - Summary: Check if systemd-boot images can be built correctly - Expected: 1. File systemd-boot.efi should be available in $poky/build/tmp/deploy/images/genericx86-64 - 2. 'systemd-boot" can be built correctly - Product: oe-core - Author: Jose Perez Carranza - AutomatedBy: Jose Perez Carranza - """ - - # We'd use DEPLOY_DIR_IMAGE here, except that we need its value for - # MACHINE="genericx86-64 which is probably not the one configured - systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'systemd-bootx64.efi') - - self._common_setup() - - # Ensure we're actually testing that this gets built and not that - # it was around from an earlier build - bitbake('-c cleansstate systemd-boot') - runCmd('rm -f %s' % systemdbootfile) - - self._common_build() - - found = os.path.isfile(systemdbootfile) - self.assertTrue(found, 'Systemd-Boot file %s not found' % systemdbootfile) -- cgit v1.2.3-54-g00ecf