[PATCH 07/12] kunit: tool: Don't overwrite test status based on subtest counts

[Thomas Weißschuh]

If a subtest itself reports success, but the outer testcase fails,
the whole testcase should be reported as a failure.
However the status is recalculated based on the test counts,
overwriting the outer test result.
Synthesize a failed test in this case to make sure the failure is not
swallowed.

Signed-off-by: Thomas Weißschuh <thomas.weisssc...@linutronix.de>
---
 tools/testing/kunit/kunit_parser.py                                  | 5 +++++
 tools/testing/kunit/kunit_tool_test.py                               | 2 +-
 tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/testing/kunit/kunit_parser.py 
b/tools/testing/kunit/kunit_parser.py
index 
29fc27e8949bd4732448fdd96024624e5350a728..8f597a244b9866528ffb3850e876acb487f3bbd4
 100644
--- a/tools/testing/kunit/kunit_parser.py
+++ b/tools/testing/kunit/kunit_parser.py
@@ -686,6 +686,11 @@ def bubble_up_test_results(test: Test) -> None:
                counts.add_status(status)
        elif test.counts.get_status() == TestStatus.TEST_CRASHED:
                test.status = TestStatus.TEST_CRASHED
+       if not test.ok_status():
+               for t in subtests:
+                       if not t.ok_status():
+                               counts.add_status(t.status)
+                               break
 
 def parse_test(lines: LineStream, expected_num: int, log: List[str], 
is_subtest: bool, printer: Printer) -> Test:
        """
diff --git a/tools/testing/kunit/kunit_tool_test.py 
b/tools/testing/kunit/kunit_tool_test.py
index 
e71ce88682e137676be49ea9854a5ddaff0dc259..aab38aa0664655c84d633ab15e4818f818b0ce47
 100755
--- a/tools/testing/kunit/kunit_tool_test.py
+++ b/tools/testing/kunit/kunit_tool_test.py
@@ -170,7 +170,7 @@ class KUnitParserTest(unittest.TestCase):
                with open(nested_log) as file:
                        result = kunit_parser.parse_run_tests(file.readlines(), 
stdout)
                self.assertEqual(kunit_parser.TestStatus.FAILURE, result.status)
-               self.assertEqual(result.counts.failed, 2)
+               self.assertEqual(result.counts.failed, 3)
                self.assertEqual(kunit_parser.TestStatus.FAILURE, 
result.subtests[0].status)
                self.assertEqual(kunit_parser.TestStatus.FAILURE, 
result.subtests[1].status)
 
diff --git 
a/tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log 
b/tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log
index 
835816e0a07715a514f5f5afab1b6250037feaf4..cd9033c464792e6294905a5676346684182874ad
 100644
--- a/tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log
+++ b/tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log
@@ -1,5 +1,8 @@
 KTAP version 1
 1..2
+    KTAP version 1
+    1..1
+        ok 1 test 1
 not ok 1 subtest 1
     KTAP version 1
     1..1

-- 
2.48.1