From d1e93041f5dda64631433a28491a2cbe689b99d3 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 7 May 2019 17:13:51 +0200 Subject: Make aktualizr-ptest depend on python3-misc Some of our tests use pathlib which ends up in there... Signed-off-by: Laurent Bonnans --- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index c0e275d..903f2de 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -10,7 +10,7 @@ DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native RDEPENDS_${PN}_class-target = "aktualizr-configs lshw" RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-repo aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}" -RDEPENDS_${PN}-ptest += "bash cmake curl python3-modules openssl-bin sqlite3 valgrind" +RDEPENDS_${PN}-ptest += "bash cmake curl python3-misc python3-modules openssl-bin sqlite3 valgrind" PV = "1.0+git${SRCPV}" PR = "7" -- cgit v1.2.3-54-g00ecf From b58fd12a1ec8bada69d548730b481d907ccdccdd Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 8 May 2019 10:56:04 +0200 Subject: Fix bad ptest printing of failures Signed-off-by: Laurent Bonnans --- lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index 8783fe0..0f0f491 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py @@ -45,7 +45,7 @@ class PtestTests(OESelftestTestCase): has_failure = re.search('^FAIL', output, flags=re.MULTILINE) is not None if has_failure: print("Full test suite log:") - stdout, _, _ = self.qemu_command('sh -c "cat /tmp/aktualizr-ptest.log || cat /tmp/aktualizr-ptest.log.tmp"', timeout=None) + stdout, _, _ = self.qemu_command('cat /tmp/aktualizr-ptest.log || cat /tmp/aktualizr-ptest.log.tmp', timeout=None) print(stdout.decode()) self.assertEqual(retcode, 0) -- cgit v1.2.3-54-g00ecf