[oe-commits] [openembedded-core] 10/25: oeqa: reproducible: Use subTest for packages
git at git.openembedded.org
git at git.openembedded.org
Thu Aug 29 16:13:14 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 607fb130e0b95d1f9883b04d8f328fbc71331cdd
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Tue Aug 27 14:33:46 2019 -0500
oeqa: reproducible: Use subTest for packages
Runs each package class reproducibility test in a separate sub-test.
This allows the other sub tests to still run in the event that one
fails.
Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/selftest/cases/reproducible.py | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 74d94fb..2b8b4e9 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -134,7 +134,7 @@ class ReproducibleTests(OESelftestTestCase):
reproducible_tmp = os.path.join(self.topdir, 'reproducible', 'tmp')
if os.path.exists(reproducible_tmp):
- bb.utils.remove(reproducible_tmp)
+ bb.utils.remove(reproducible_tmp, recurse=True)
# Perform another build. This build should *not* share sstate or pull
# from any mirrors, but sharing a DL_DIR is fine
@@ -150,18 +150,19 @@ class ReproducibleTests(OESelftestTestCase):
# kept after the build so it can be diffed for debugging.
for c in self.package_classes:
- package_class = 'package_' + c
+ with self.subTest(package_class=c):
+ package_class = 'package_' + c
- deploy_reference = vars_reference['DEPLOY_DIR_' + c.upper()]
- deploy_test = vars_test['DEPLOY_DIR_' + c.upper()]
+ deploy_reference = vars_reference['DEPLOY_DIR_' + c.upper()]
+ deploy_test = vars_test['DEPLOY_DIR_' + c.upper()]
- result = self.compare_packages(deploy_reference, deploy_test, diffutils_sysroot)
+ result = self.compare_packages(deploy_reference, deploy_test, diffutils_sysroot)
- self.logger.info('Reproducibility summary for %s: %s' % (c, result))
+ self.logger.info('Reproducibility summary for %s: %s' % (c, result))
- self.append_to_log('\n'.join("%s: %s" % (r.status, r.test) for r in result.total))
+ self.append_to_log('\n'.join("%s: %s" % (r.status, r.test) for r in result.total))
- if result.missing or result.different:
- self.fail("The following %s packages are missing or different: %s" %
- (c, ' '.join(r.test for r in (result.missing + result.different))))
+ if result.missing or result.different:
+ self.fail("The following %s packages are missing or different: %s" %
+ (c, ' '.join(r.test for r in (result.missing + result.different))))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list