| Message ID | 20211027013702.2039566-1-davidgow@google.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | [v2,1/4] kunit: tool: Do not error on tests without test plans | expand |
On Tue, Oct 26, 2021 at 6:37 PM David Gow <davidgow@google.com> wrote: > > The (K)TAP spec encourages test output to begin with a 'test plan': a > count of the number of tests being run of the form: > 1..n > > However, some test suites might not know the number of subtests in > advance (for example, KUnit's parameterised tests use a generator > function). In this case, it's not possible to print the test plan in > advance. > > kunit_tool already parses test output which doesn't contain a plan, but > reports an error. Since we want to use nested subtests with KUnit > paramterised tests, remove this error. > > Signed-off-by: David Gow <davidgow@google.com> Reviewed-by: Daniel Latypov <dlatypov@google.com> This looks to be unchanged from v1. Looks good to me given kunit itself will report SKIPPED for parameterised tests. > --- > tools/testing/kunit/kunit_parser.py | 5 ++--- > tools/testing/kunit/kunit_tool_test.py | 5 ++++- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py > index 3355196d0515..50ded55c168c 100644 > --- a/tools/testing/kunit/kunit_parser.py > +++ b/tools/testing/kunit/kunit_parser.py > @@ -340,8 +340,8 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: > """ > Parses test plan line and stores the expected number of subtests in > test object. Reports an error if expected count is 0. > - Returns False and reports missing test plan error if fails to parse > - test plan. > + Returns False and sets expected_count to None if there is no valid test > + plan. > > Accepted format: > - '1..[number of subtests]' > @@ -356,7 +356,6 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: > match = TEST_PLAN.match(lines.peek()) > if not match: > test.expected_count = None > - test.add_error('missing plan line!') > return False > test.log.append(lines.pop()) > expected_count = int(match.group(1)) > diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py > index 9c4126731457..bc8793145713 100755 > --- a/tools/testing/kunit/kunit_tool_test.py > +++ b/tools/testing/kunit/kunit_tool_test.py > @@ -191,7 +191,10 @@ class KUnitParserTest(unittest.TestCase): > result = kunit_parser.parse_run_tests( > kunit_parser.extract_tap_lines( > file.readlines())) > - self.assertEqual(2, result.test.counts.errors) > + # A missing test plan is not an error. > + self.assertEqual(0, result.test.counts.errors) > + # All tests should be accounted for. > + self.assertEqual(10, result.test.counts.total()) > self.assertEqual( > kunit_parser.TestStatus.SUCCESS, > result.status) > -- > 2.33.0.1079.g6e70778dc9-goog >
On Thu, Oct 28, 2021 at 6:13 AM Daniel Latypov <dlatypov@google.com> wrote: > > On Tue, Oct 26, 2021 at 6:37 PM David Gow <davidgow@google.com> wrote: > > > > The (K)TAP spec encourages test output to begin with a 'test plan': a > > count of the number of tests being run of the form: > > 1..n > > > > However, some test suites might not know the number of subtests in > > advance (for example, KUnit's parameterised tests use a generator > > function). In this case, it's not possible to print the test plan in > > advance. > > > > kunit_tool already parses test output which doesn't contain a plan, but > > reports an error. Since we want to use nested subtests with KUnit > > paramterised tests, remove this error. > > > > Signed-off-by: David Gow <davidgow@google.com> > > Reviewed-by: Daniel Latypov <dlatypov@google.com> > > This looks to be unchanged from v1. Yeah, the changes in v2 were all in the new patches. -- David
diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 3355196d0515..50ded55c168c 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -340,8 +340,8 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: """ Parses test plan line and stores the expected number of subtests in test object. Reports an error if expected count is 0. - Returns False and reports missing test plan error if fails to parse - test plan. + Returns False and sets expected_count to None if there is no valid test + plan. Accepted format: - '1..[number of subtests]' @@ -356,7 +356,6 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: match = TEST_PLAN.match(lines.peek()) if not match: test.expected_count = None - test.add_error('missing plan line!') return False test.log.append(lines.pop()) expected_count = int(match.group(1)) diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index 9c4126731457..bc8793145713 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -191,7 +191,10 @@ class KUnitParserTest(unittest.TestCase): result = kunit_parser.parse_run_tests( kunit_parser.extract_tap_lines( file.readlines())) - self.assertEqual(2, result.test.counts.errors) + # A missing test plan is not an error. + self.assertEqual(0, result.test.counts.errors) + # All tests should be accounted for. + self.assertEqual(10, result.test.counts.total()) self.assertEqual( kunit_parser.TestStatus.SUCCESS, result.status)
The (K)TAP spec encourages test output to begin with a 'test plan': a count of the number of tests being run of the form: 1..n However, some test suites might not know the number of subtests in advance (for example, KUnit's parameterised tests use a generator function). In this case, it's not possible to print the test plan in advance. kunit_tool already parses test output which doesn't contain a plan, but reports an error. Since we want to use nested subtests with KUnit paramterised tests, remove this error. Signed-off-by: David Gow <davidgow@google.com> --- tools/testing/kunit/kunit_parser.py | 5 ++--- tools/testing/kunit/kunit_tool_test.py | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-)