diff mbox series

[1/6] selftest/sstatetest: print output from bitbake with actual newlines, not \n

Message ID 20231208101522.198832-1-alex@linutronix.de
State Accepted, archived
Commit 1b01a71e77f70af77887c27be21265ac61f2c9a7
Headers show
Series [1/6] selftest/sstatetest: print output from bitbake with actual newlines, not \n | expand

Commit Message

Alexander Kanavin Dec. 8, 2023, 10:15 a.m. UTC 
Assert*() functions from python unittest would join the multiline output with \n, making it
almost unreadable.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/selftest/cases/sstatetests.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 7c2b14e95f6..79001854501 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -798,9 +798,9 @@  TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2"
 
         self.delete_recipeinc(change_recipe)
         for item in expected_sametmp_output:
-            self.assertIn(item, result_sametmp.output)
+            self.assertIn(item, result_sametmp.output, msg = "Item {} not found in output:\n{}".format(item, result_sametmp.output))
         for item in expected_difftmp_output:
-            self.assertIn(item, result_difftmp.output)
+            self.assertIn(item, result_difftmp.output, msg = "Item {} not found in output:\n{}".format(item, result_difftmp.output))
 
     def run_test_printdiff_changeconfig(self, target, change_content, expected_sametmp_output, expected_difftmp_output):
         self.write_config("""
@@ -820,9 +820,9 @@  TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2"
         result_difftmp = bitbake("-S printdiff {}".format(target))
 
         for item in expected_sametmp_output:
-            self.assertIn(item, result_sametmp.output)
+            self.assertIn(item, result_sametmp.output, msg = "Item {} not found in output:\n{}".format(item, result_sametmp.output))
         for item in expected_difftmp_output:
-            self.assertIn(item, result_difftmp.output)
+            self.assertIn(item, result_difftmp.output, msg = "Item {} not found in output:\n{}".format(item, result_difftmp.output))
 
 
     # Check if printdiff walks the full dependency chain from the image target to where the change is in a specific recipe