On Tue, 30 Dec 2025 at 20:26, Thomas Weißschuh <[email protected]> wrote: > > 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 <[email protected]> > Reviewed-by: David Gow <[email protected]> > ---
Thanks. Still looking good! Reviewed-by: David Gow <[email protected]> Cheers, -- David > tools/testing/kunit/kunit_parser.py | 3 +++ > tools/testing/kunit/kunit_tool_test.py | 1 + > tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log | 3 +++ > 3 files changed, 7 insertions(+) > > diff --git a/tools/testing/kunit/kunit_parser.py > b/tools/testing/kunit/kunit_parser.py > index 333cd3a4a56b..5338489dcbe4 100644 > --- a/tools/testing/kunit/kunit_parser.py > +++ b/tools/testing/kunit/kunit_parser.py > @@ -689,6 +689,9 @@ def bubble_up_test_results(test: Test) -> None: > elif test.counts.get_status() == TestStatus.TEST_CRASHED: > test.status = TestStatus.TEST_CRASHED > > + if status == TestStatus.FAILURE and test.counts.get_status() == > TestStatus.SUCCESS: > + counts.add_status(status) > + > def parse_test(lines: LineStream, expected_num: int, log: List[str], > is_subtest: bool, printer: Printer) -> Test: > """ > Finds next test to parse in LineStream, creates new Test object, > diff --git a/tools/testing/kunit/kunit_tool_test.py > b/tools/testing/kunit/kunit_tool_test.py > index b74dc05fc2fe..d5bbcb95ab6a 100755 > --- a/tools/testing/kunit/kunit_tool_test.py > +++ b/tools/testing/kunit/kunit_tool_test.py > @@ -172,6 +172,7 @@ class KUnitParserTest(unittest.TestCase): > self.assertEqual(kunit_parser.TestStatus.FAILURE, > result.status) > self.assertEqual(result.counts.failed, 2) > self.assertEqual(kunit_parser.TestStatus.FAILURE, > result.subtests[0].status) > + self.assertEqual(kunit_parser.TestStatus.SUCCESS, > result.subtests[0].subtests[0].status) > self.assertEqual(kunit_parser.TestStatus.FAILURE, > result.subtests[1].status) > self.assertEqual(kunit_parser.TestStatus.FAILURE, > result.subtests[1].subtests[0].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 2e528da39ab5..5498dfd0b0db 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.52.0 >
smime.p7s
Description: S/MIME Cryptographic Signature
