| Message ID | 20231205203852.1700497-1-rmoar@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8ae27bc7fff4ef467a7964821a6cedb34a05d3b2 |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | kunit: tool: fix parsing of test attributes | expand |
On Wed, 6 Dec 2023 at 04:39, Rae Moar <rmoar@google.com> wrote: > > Add parsing of attributes as diagnostic data. Fixes issue with test plan > being parsed incorrectly as diagnostic data when located after > suite-level attributes. > > Note that if there does not exist a test plan line, the diagnostic lines > between the suite header and the first result will be saved in the suite > log rather than the first test case log. > > Signed-off-by: Rae Moar <rmoar@google.com> > --- This seems sensible to me, though I'd love to have a test to go along with it (or at least an example input which shows the problem). Indeed, none of the logs in tools/testing/kunit/test_output/ seem to have any KTAP metadata / attributes, so we probably should test that better. -- David > > Note this patch is a resend but I removed the second patch in the series > so now it is a standalone patch. > > tools/testing/kunit/kunit_parser.py | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py > index 79d8832c862a..ce34be15c929 100644 > --- a/tools/testing/kunit/kunit_parser.py > +++ b/tools/testing/kunit/kunit_parser.py > @@ -450,7 +450,7 @@ def parse_diagnostic(lines: LineStream) -> List[str]: > Log of diagnostic lines > """ > log = [] # type: List[str] > - non_diagnostic_lines = [TEST_RESULT, TEST_HEADER, KTAP_START, TAP_START] > + non_diagnostic_lines = [TEST_RESULT, TEST_HEADER, KTAP_START, TAP_START, TEST_PLAN] > while lines and not any(re.match(lines.peek()) > for re in non_diagnostic_lines): > log.append(lines.pop()) > @@ -726,6 +726,7 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: > # test plan > test.name = "main" > ktap_line = parse_ktap_header(lines, test) > + test.log.extend(parse_diagnostic(lines)) > parse_test_plan(lines, test) > parent_test = True > else: > @@ -737,6 +738,7 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: > 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) > expected_count = test.expected_count > > base-commit: b85ea95d086471afb4ad062012a4d73cd328fa86 > -- > 2.43.0.rc2.451.g8631bc7472-goog >
diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 79d8832c862a..ce34be15c929 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -450,7 +450,7 @@ def parse_diagnostic(lines: LineStream) -> List[str]: Log of diagnostic lines """ log = [] # type: List[str] - non_diagnostic_lines = [TEST_RESULT, TEST_HEADER, KTAP_START, TAP_START] + non_diagnostic_lines = [TEST_RESULT, TEST_HEADER, KTAP_START, TAP_START, TEST_PLAN] while lines and not any(re.match(lines.peek()) for re in non_diagnostic_lines): log.append(lines.pop()) @@ -726,6 +726,7 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: # test plan test.name = "main" ktap_line = parse_ktap_header(lines, test) + test.log.extend(parse_diagnostic(lines)) parse_test_plan(lines, test) parent_test = True else: @@ -737,6 +738,7 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: 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) expected_count = test.expected_count
Add parsing of attributes as diagnostic data. Fixes issue with test plan being parsed incorrectly as diagnostic data when located after suite-level attributes. Note that if there does not exist a test plan line, the diagnostic lines between the suite header and the first result will be saved in the suite log rather than the first test case log. Signed-off-by: Rae Moar <rmoar@google.com> --- Note this patch is a resend but I removed the second patch in the series so now it is a standalone patch. tools/testing/kunit/kunit_parser.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: b85ea95d086471afb4ad062012a4d73cd328fa86