summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-03 23:39:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-11 23:05:12 +0000
commite8c813141d2aaf74361cf95060eaf428a4bc2c33 (patch)
tree4e8c3cbb35bea4be50e0adddf5986f429a978005
parent00534e3e4cfb5c82f5b3ca3634ada73f5acc41b7 (diff)
downloadpoky-e8c813141d2aaf74361cf95060eaf428a4bc2c33.tar.gz
oeqa/reproducible: Improve test output and ensure deb+ipk compared
Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. (From OE-Core rev: 6e2e0480852177db75a6108d77c99c92c4e9950f) (From OE-Core rev: 4d470f48f7fb5e05fba1ca3a59fb4f85d910026e) (From OE-Core rev: 38359c79dc6e02a21d1bc26756c8bd88da762ef8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index a9110565a9..1b0b5bae70 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -174,6 +174,8 @@ class ReproducibleTests(OESelftestTestCase):
174 # NOTE: The temp directories from the reproducible build are purposely 174 # NOTE: The temp directories from the reproducible build are purposely
175 # kept after the build so it can be diffed for debugging. 175 # kept after the build so it can be diffed for debugging.
176 176
177 fails = []
178
177 for c in self.package_classes: 179 for c in self.package_classes:
178 with self.subTest(package_class=c): 180 with self.subTest(package_class=c):
179 package_class = 'package_' + c 181 package_class = 'package_' + c
@@ -197,6 +199,9 @@ class ReproducibleTests(OESelftestTestCase):
197 self.copy_file(d.test, '/'.join([save_dir, d.test])) 199 self.copy_file(d.test, '/'.join([save_dir, d.test]))
198 200
199 if result.missing or result.different: 201 if result.missing or result.different:
200 self.fail("The following %s packages are missing or different: %s" % 202 fails.append("The following %s packages are missing or different: %s" %
201 (c, ' '.join(r.test for r in (result.missing + result.different)))) 203 (c, '\n'.join(r.test for r in (result.missing + result.different))))
204
205 if fails:
206 self.fail('\n'.join(fails))
202 207