From 08e60a5085e6e6da95d7c85fed16147ce9e834af Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 8 Jul 2019 11:28:34 +0200 Subject: Factor out ugly function in oe-selftests Signed-off-by: Laurent Bonnans --- lib/oeqa/selftest/cases/testutils.py | 10 +++++ lib/oeqa/selftest/cases/updater_minnowboard.py | 12 ++---- lib/oeqa/selftest/cases/updater_qemux86_64.py | 47 ++++------------------ .../selftest/cases/updater_qemux86_64_ptest.py | 9 +---- lib/oeqa/selftest/cases/updater_raspberrypi.py | 13 +++--- 5 files changed, 28 insertions(+), 63 deletions(-) diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py index 900d15c..e67f30c 100644 --- a/lib/oeqa/selftest/cases/testutils.py +++ b/lib/oeqa/selftest/cases/testutils.py @@ -69,6 +69,16 @@ def qemu_send_command(port, command, timeout=60): return stdout, stderr, s2.returncode +def metadir(): + # Assume the directory layout for finding other layers. We could also + # make assumptions by using 'show-layers', but either way, if the + # layers we need aren't where we expect them, we are out of luck. + path = os.path.abspath(os.path.dirname(__file__)) + metadir = path + "/../../../../../" + + return metadir + + def akt_native_run(testInst, cmd, **kwargs): # run a command supplied by aktualizr-native and checks that: # - the executable exists diff --git a/lib/oeqa/selftest/cases/updater_minnowboard.py b/lib/oeqa/selftest/cases/updater_minnowboard.py index 267445b..855bd20 100644 --- a/lib/oeqa/selftest/cases/updater_minnowboard.py +++ b/lib/oeqa/selftest/cases/updater_minnowboard.py @@ -1,9 +1,8 @@ -import os import re from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, get_bb_var -from testutils import qemu_launch, qemu_send_command, qemu_terminate, verifyProvisioned +from testutils import metadir, qemu_launch, qemu_send_command, qemu_terminate, verifyProvisioned class MinnowTests(OESelftestTestCase): @@ -12,18 +11,13 @@ class MinnowTests(OESelftestTestCase): layer_intel = "meta-intel" layer_minnow = "meta-updater-minnowboard" result = runCmd('bitbake-layers show-layers') - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" if re.search(layer_intel, result.output) is None: - self.meta_intel = metadir + layer_intel + self.meta_intel = metadir() + layer_intel runCmd('bitbake-layers add-layer "%s"' % self.meta_intel) else: self.meta_intel = None if re.search(layer_minnow, result.output) is None: - self.meta_minnow = metadir + layer_minnow + self.meta_minnow = metadir() + layer_minnow runCmd('bitbake-layers add-layer "%s"' % self.meta_minnow) else: self.meta_minnow = None diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index c61c9b2..7228529 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py @@ -9,7 +9,8 @@ from uuid import uuid4 from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars from testutils import qemu_launch, qemu_send_command, qemu_terminate, \ - akt_native_run, verifyNotProvisioned, verifyProvisioned, qemu_bake_image, qemu_boot_image + metadir, akt_native_run, verifyNotProvisioned, verifyProvisioned, \ + qemu_bake_image, qemu_boot_image class GeneralTests(OESelftestTestCase): @@ -46,8 +47,6 @@ class AktualizrToolsTests(OESelftestTestCase): akt_native_run(self, 'aktualizr-cert-provider --help') def test_cert_provider_local_output(self): - logger = logging.getLogger("selftest") - logger.info('Running bitbake to build aktualizr-device-prov') bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') creds = bb_vars['SOTA_PACKED_CREDENTIALS'] temp_dir = bb_vars['T'] @@ -75,12 +74,7 @@ class SharedCredProvTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None @@ -117,12 +111,7 @@ class ManualControlTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None @@ -161,12 +150,7 @@ class DeviceCredProvTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None @@ -217,12 +201,7 @@ class DeviceCredProvHsmTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None @@ -399,12 +378,7 @@ class IpSecondaryTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None @@ -446,12 +420,7 @@ class ResourceControlTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index 0f0f491..88e773b 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py @@ -4,7 +4,7 @@ import re from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd -from testutils import qemu_launch, qemu_send_command, qemu_terminate +from testutils import metadir, qemu_launch, qemu_send_command, qemu_terminate class PtestTests(OESelftestTestCase): @@ -13,12 +13,7 @@ class PtestTests(OESelftestTestCase): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') if re.search(layer, result.output) is None: - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" - self.meta_qemu = metadir + layer + self.meta_qemu = metadir() + layer runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) else: self.meta_qemu = None diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py index 6b71a03..b1375bb 100644 --- a/lib/oeqa/selftest/cases/updater_raspberrypi.py +++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py @@ -7,6 +7,8 @@ import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var +from testutils import metadir + class RpiTests(OESelftestTestCase): @@ -17,23 +19,18 @@ class RpiTests(OESelftestTestCase): layer_rpi = "meta-raspberrypi" layer_upd_rpi = "meta-updater-raspberrypi" result = runCmd('bitbake-layers show-layers') - # Assume the directory layout for finding other layers. We could also - # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of luck. - path = os.path.abspath(os.path.dirname(__file__)) - metadir = path + "/../../../../../" if re.search(layer_python, result.output) is None: - self.meta_python = metadir + layer_python + self.meta_python = metadir() + layer_python runCmd('bitbake-layers add-layer "%s"' % self.meta_python) else: self.meta_python = None if re.search(layer_rpi, result.output) is None: - self.meta_rpi = metadir + layer_rpi + self.meta_rpi = metadir() + layer_rpi runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) else: self.meta_rpi = None if re.search(layer_upd_rpi, result.output) is None: - self.meta_upd_rpi = metadir + layer_upd_rpi + self.meta_upd_rpi = metadir() + layer_upd_rpi runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) else: self.meta_upd_rpi = None -- cgit v1.2.3-54-g00ecf