[oe-commits] [openembedded-core] 09/30: oeqa/reproducible: Improve test output and ensure deb+ipk compared

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch zeus
in repository openembedded-core.

commit 38359c79dc6e02a21d1bc26756c8bd88da762ef8
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Feb 3 23:39:29 2020 +0000

    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)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index a911056..1b0b5ba 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -174,6 +174,8 @@ class ReproducibleTests(OESelftestTestCase):
         # NOTE: The temp directories from the reproducible build are purposely
         # kept after the build so it can be diffed for debugging.
 
+        fails = []
+
         for c in self.package_classes:
             with self.subTest(package_class=c):
                 package_class = 'package_' + c
@@ -197,6 +199,9 @@ class ReproducibleTests(OESelftestTestCase):
                         self.copy_file(d.test, '/'.join([save_dir, d.test]))
 
                 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))))
+                    fails.append("The following %s packages are missing or different: %s" %
+                            (c, '\n'.join(r.test for r in (result.missing + result.different))))
+
+        if fails:
+            self.fail('\n'.join(fails))
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.