| Message ID | 20250313192714.1380005-1-rmoar@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/2] kunit: tool: Fix bug in parsing test plan | expand |
On Mon, Mar 17, 2025 at 12:13 PM Brendan Jackman <jackmanb@google.com> wrote: > > On Fri, 14 Mar 2025 at 06:37, David Gow <davidgow@google.com> wrote: > > > > On Fri, 14 Mar 2025 at 03:27, Rae Moar <rmoar@google.com> wrote: > > > > > > A bug was identified where the KTAP below caused an infinite loop: > > > > > > TAP version 13 > > > ok 4 test_case > > > 1..4 > > > > > > The infinite loop was caused by the parser not parsing a test plan > > > if following a test result line. > > > > > > Fix this bug by parsing test plan line to avoid the infinite loop. > > Hi Rae, > > With this change and this input: > > https://gist.githubusercontent.com/bjackman/220265699f346e16161c6534b115019b/raw/a2e0e1aa75c0d8ab9814708b028ec78810a0471b/run_vmtests.sh.tap > > The infinite loop is gone, but it's still hallucinating a [CRASHED] result: > > [16:07:15] # SUMMARY: PASS=17 SKIP=0 FAIL=1 > [16:07:15] [CRASHED] > ... > [16:07:15] Testing complete. Ran 19 tests: passed: 17, failed: 1, crashed: 1 Hi! Thanks for the response. This is an interesting problem. Should a test plan at the bottom cause a crash because no tests were found after? Again with KTAP, a crash would make sense. I feel this example demonstrates why there is a need for a general parser that can parse kselftest output as well as KUnit. I'll see how difficult it would be to change the parser to accommodate removing the crash in a new version. Thanks! -Rae
diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 29fc27e8949b..da53a709773a 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -759,7 +759,7 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: # If parsing the main/top-level test, parse KTAP version line and # test plan test.name = "main" - ktap_line = parse_ktap_header(lines, test, printer) + parse_ktap_header(lines, test, printer) test.log.extend(parse_diagnostic(lines)) parse_test_plan(lines, test) parent_test = True @@ -768,13 +768,12 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: # the KTAP version line and/or subtest header line ktap_line = parse_ktap_header(lines, test, printer) subtest_line = parse_test_header(lines, test) + test.log.extend(parse_diagnostic(lines)) + parse_test_plan(lines, test) parent_test = (ktap_line or subtest_line) if parent_test: - # If KTAP version line and/or subtest header is found, attempt - # to parse test plan and print test header - test.log.extend(parse_diagnostic(lines)) - parse_test_plan(lines, test) print_test_header(test, printer) + expected_count = test.expected_count subtests = [] test_num = 1
A bug was identified where the KTAP below caused an infinite loop: TAP version 13 ok 4 test_case 1..4 The infinite loop was caused by the parser not parsing a test plan if following a test result line. Fix this bug by parsing test plan line to avoid the infinite loop. Signed-off-by: Rae Moar <rmoar@google.com> --- Changes since v2: - None, adds test in second patch tools/testing/kunit/kunit_parser.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) base-commit: 0619a4868fc1b32b07fb9ed6c69adc5e5cf4e4b2