Linux-kselftest-mirror
August 2021
linux-kselftest-mirror@lists.linaro.org
- 121 participants
- 140 discussions
Re: [PATCH v2] kunit: tool: improve compatibility of kunit_parser with KTAP specification
by Rae Moar
On Mon, Aug 30, 2021 at 4:08 PM <Tim.Bird(a)sony.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Rae Moar <rmoar(a)google.com>
> >
> > On Thu, Aug 26, 2021 at 7:49 PM Daniel Latypov <dlatypov(a)google.com> wrote:
> > >
> > > On Thu, Aug 26, 2021 at 12:55 PM 'Rae Moar' via KUnit Development
> > > <kunit-dev(a)googlegroups.com> wrote:
> > > >
> > > > Update to kunit_parser to improve compatibility with KTAP
> > > > specification including arbitrarily nested tests. Patch accomplishes
> > > > three major changes:
> > > >
> > > > - Use a general Test object to represent all tests rather than TestCase
> > > > and TestSuite objects. This allows for easier implementation of arbitrary
> > > > levels of nested tests and promotes the idea that both test suites and test
> > > > cases are tests.
> > > >
> > > > - Print errors incrementally rather than all at once after the
> > > > parsing finishes to maximize information given to the user in the
> > > > case of the parser given invalid input and to increase the helpfulness
> > > > of the timestamps given during printing. Note that kunit.py parse does
> > > > not print incrementally yet. However, this fix brings us closer to
> > > > this feature.
> > > >
> > > > - Increase compatibility for different formats of input. Arbitrary levels
> > > > of nested tests supported. Also, test cases and test suites are now
> > > > supported to be present on the same level of testing.
> > > >
> > > > This patch now implements the KTAP specification as described here:
> > > > https://lore.kernel.org/linux-kselftest/CA+GJov6tdjvY9x12JsJT14qn6c7NViJxqa….
> > > >
> > > > This patch adjusts the kunit_tool_test.py file to check for
> > > > the correct outputs from the new parser and adds a new test to check
> > > > the parsing for a KTAP result log with correct format for multiple nested
> > > > subtests (test_is_test_passed-all_passed_nested.log).
> > > >
> > > > This patch also alters the kunit_json.py file to allow for arbitrarily
> > > > nested tests.
> > > >
> > > > Signed-off-by: Rae Moar <rmoar(a)google.com>
> > > > Reviewed-by: Brendan Higgins <brendanhiggins(a)google.com>
> > >
> > > Acked-by: Daniel Latypov <dlatypov(a)google.com>
> > >
> > > Looks good to me, some more bikeshedding about comments below.
> > > pytype does find a minor error (which was actually my fault since I'd
> > > suggested you annotate `build_dir: str` off-list).
> > > Also, this patch accidentally adds kunit_parser.raw_output() back in.
> > >
> >
> > Thanks for pointing out the pytype error! I will change the annotation in
> > v3. I will also remove kunit_parser.raw_output() in v3.
> >
> > > >
> > > > ---
> > > >
> > > > Change log from v1:
> > > > https://lore.kernel.org/linux-kselftest/20210820200032.2178134-1-rmoar@goog…
> > > > - Rebase onto kselftest/kunit branch
> > > > - Add tests to kunit_tool_test.py to check parser is correctly stripping
> > > > hyphen, producing correct json objects with nested tests, correctly
> > > > passing kselftest TAP output, and correctly deals with missing test plan.
> > > > - Fix bug to correctly match test name in instance of a missing test plan.
> > > > - Fix bug in kunit_tool_test.py pointed out by Daniel where it was not
> > > > correctly checking for a proper match to the '0 tests run!' error
> > > > message. Reverts changes back to original.
> > > > - A few minor changes to commit message using Daniel's comments.
> > > > - Change docstrings using Daniel's comments to reduce:
> > > > - Shortens some docstrings to be one-line or just description if it is
> > > > self explanatory.
> > > > - Remove explicit respecification of types of parameters and returns
> > > >
this is already specified in the function annoations. However,
> > > > some descriptions of the parameters and returns remain and some contain
> > > > the type for context. Additionally, the types of public attributes of
> > > > classes remain.
> > > > - Remove any documentation of 'Return: None'
> > > > - Remove docstrings of helper methods within other methods.
> > > > ---
> > > > tools/testing/kunit/kunit_json.py | 55 +-
> > > > tools/testing/kunit/kunit_parser.py | 1056 ++++++++++++-----
> > > > tools/testing/kunit/kunit_tool_test.py | 134 ++-
> > > > .../test_is_test_passed-all_passed_nested.log | 34 +
> > > > .../test_is_test_passed-kselftest.log | 14 +
> > > > .../test_is_test_passed-missing_plan.log | 31 +
> > > > .../kunit/test_data/test_strip_hyphen.log | 16 +
> > > > 7 files changed, 951 insertions(+), 389 deletions(-)
> > > > create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
> > > > create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-kselftest.log
> > > > create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log
> > > > create mode 100644 tools/testing/kunit/test_data/test_strip_hyphen.log
> > > >
> > > > diff --git a/tools/testing/kunit/kunit_json.py b/tools/testing/kunit/kunit_json.py
> > > > index f5cca5c38cac..e7317b4fad9d 100644
> > > > --- a/tools/testing/kunit/kunit_json.py
> > > > +++ b/tools/testing/kunit/kunit_json.py
> > > > @@ -11,47 +11,46 @@ import os
> > > >
> > > > import kunit_parser
> > > >
> > > > -from kunit_parser import TestStatus
> > > > -
> > > > -def get_json_result(test_result, def_config, build_dir, json_path) -> str:
> > > > - sub_groups = []
> > > > -
> > > > - # Each test suite is mapped to a KernelCI sub_group
> > > > - for test_suite in test_result.suites:
> > > > - sub_group = {
> > > > - "name": test_suite.name,
> > > > - "arch": "UM",
> > > > - "defconfig": def_config,
> > > > - "build_environment": build_dir,
> > > > - "test_cases": [],
> > > > - "lab_name": None,
> > > > - "kernel": None,
> > > > - "job": None,
> > > > - "git_branch": "kselftest",
> > > > - }
> > > > - test_cases = []
> > > > - # TODO: Add attachments attribute in test_case with detailed
> > > > - # failure message, see https://api.kernelci.org/schema-test-case.html#get
> > > > - for case in test_suite.cases:
> > > > - test_case = {"name": case.name, "status": "FAIL"}
> > > > - if case.status == TestStatus.SUCCESS:
> > > > +from kunit_parser import Test, TestResult, TestStatus
> > > > +from typing import Any, Dict
> > > > +
> > > > +JsonObj = Dict[str, Any]
> > > > +
> > > > +def _get_group_json(test: Test, def_config: str, build_dir: str) -> JsonObj:
> > >
> > >
> > > Ah, pytype complains about this.
> > > Looks like the unit test passes None here.
> > >
> > > We can either make this annotation say `build_dir: Optional[str]` or
> > > change the unit test to pass '' instead of None.
> > > The former might be preferable to keep this change more focused.
> > >
> >
> > Thanks for finding this! I also like 'build_dir: Optional[str]' to keep the
> > changes limited to the files already being updated.
> >
> > >
> > > > + sub_groups = [] # List[JsonObj]
> > > > + test_cases = [] # List[JsonObj]
> > > > +
> > > > + for subtest in test.subtests:
> > > > + if len(subtest.subtests):
> > > > + sub_group = _get_group_json(subtest, def_config,
> > > > + build_dir)
> > > > + sub_groups.append(sub_group)
> > > > + else:
> > > > + test_case = {"name": subtest.name, "status": "FAIL"}
> > > > + if subtest.status == TestStatus.SUCCESS:
> > > > test_case["status"] = "PASS"
> > > > - elif case.status == TestStatus.TEST_CRASHED:
> > > > + elif subtest.status == TestStatus.TEST_CRASHED:
> > > > test_case["status"] = "ERROR"
> > > > test_cases.append(test_case)
> > > > - sub_group["test_cases"] = test_cases
> > > > - sub_groups.append(sub_group)
> > > > +
> > > > test_group = {
> > > > - "name": "KUnit Test Group",
> > > > + "name": test.name,
> > > > "arch": "UM",
> > > > "defconfig": def_config,
> > > > "build_environment": build_dir,
> > > > "sub_groups": sub_groups,
> > > > + "test_cases": test_cases,
> > > > "lab_name": None,
> > > > "kernel": None,
> > > > "job": None,
> > > > "git_branch": "kselftest",
> > > > }
> > > > + return test_group
> > > > +
> > > > +def get_json_result(test_result: TestResult, def_config: str, build_dir: str,
> > > > + json_path: str) -> str:
> > > > + test_group = _get_group_json(test_result.test, def_config, build_dir)
> > > > + test_group["name"] = "KUnit Test Group"
> > > > json_obj = json.dumps(test_group, indent=4)
> > > > if json_path != 'stdout':
> > > > with open(json_path, 'w') as result_path:
> > > > diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py
> > > > index 6310a641b151..4b6086159c7f 100644
> > > > --- a/tools/testing/kunit/kunit_parser.py
> > > > +++ b/tools/testing/kunit/kunit_parser.py
> > > > @@ -1,11 +1,15 @@
> > > > # SPDX-License-Identifier: GPL-2.0
> > > > #
> > > > -# Parses test results from a kernel dmesg log.
> > > > +# Parses KTAP test results from a kernel dmesg log and incrementally prints
> > > > +# results with reader-friendly format. Stores and returns test results in a
> > > > +# Test object.
> > > > #
> > > > # Copyright (C) 2019, Google LLC.
> > > > # Author: Felix Guo <felixguoxiuping(a)gmail.com>
> > > > # Author: Brendan Higgins <brendanhiggins(a)google.com>
> > > > +# Author: Rae Moar <rmoar(a)google.com>
> > > >
> > > > +from __future__ import annotations
> > > > import re
> > > >
> > > > from collections import namedtuple
> > > > @@ -14,33 +18,55 @@ from enum import Enum, auto
> > > > from functools import reduce
> > > > from typing import Iterable, Iterator, List, Optional, Tuple
> > > >
> > > > -TestResult = namedtuple('TestResult', ['status','suites','log'])
> > > > -
> > > > -class TestSuite(object):
> > > > - def __init__(self) -> None:
> > > > - self.status = TestStatus.SUCCESS
> > > > - self.name = ''
> > > > - self.cases = [] # type: List[TestCase]
> > > > -
> > > > - def __str__(self) -> str:
> > > > - return 'TestSuite(' + str(self.status) + ',' + self.name + ',' + str(self.cases) + ')'
> > > > -
> > > > - def __repr__(self) -> str:
> > > > - return str(self)
> > > > -
> > > > -class TestCase(object):
> > > > +TestResult = namedtuple('TestResult', ['status','test','log'])
> > > > +
> > > > +class Test(object):
> > > > + """
> > > > + A class to represent a test parsed from KTAP results. All KTAP
> > > > + results within a test log are stored in a main Test object as
> > > > + subtests.
> > > > +
> > > > + Attributes:
> > > > + status : TestStatus - status of the test
> > > > + name : str - name of the test
> > > > + expected_count : int - expected number of subtests (0 if single
> > > > + test case and None if unknown expected number of subtests)
> > > > + subtests : List[Test] - list of subtests
> > > > + log : List[str] - log of KTAP lines that correspond to the test
> > > > + counts : TestCounts - counts of the test statuses and errors of
> > > > + subtests or of the test itself if the test is a single
> > > > + test case.
> > > > + """
> > > > def __init__(self) -> None:
> > > > + """Constructs the default attributes of a Test class object.
> > > > + """
> > >
> > > Optional: I think we can still drop documents like this on __init__()
> > > and __str__() since these are well-known functions.
> > > __init__() could have a comment if it did anything non-obvious, but
> > > that's not the case here.
> > >
> >
> > I would prefer to keep docstrings for all public methods in classes,
> > including __init__() and __str__(). This best follows the docstring
> > conventions (https://www.python.org/dev/peps/pep-0257/#specification).
> > I have attempted to make the docstrings for simple methods quite simplistic.
> > I may even change this docstring to be: 'Creates Test object with default
> > attributes' in order to not refer to the low-level details of constructing the
> > attributes.
> >
> > > > self.status = TestStatus.SUCCESS
> > > > self.name = ''
> > > > + self.expected_count = 0 # type: Optional[int]
> > > > + self.subtests = [] # type: List[Test]
> > > > self.log = [] # type: List[str]
> > > > + self.counts = TestCounts()
> > > >
> > > > def __str__(self) -> str:
> > > > - return 'TestCase(' + str(self.status) + ',' + self.name + ',' + str(self.log) + ')'
> > > > + """Returns string representation of a Test class object."""
> > > > + return ('Test(' + str(self.status) + ', ' + self.name +
> > > > + ', ' + str(self.expected_count) + ', ' +
> > > > + str(self.subtests) + ', ' + str(self.log) + ', ' +
> > > > + str(self.counts) + ')')
> > > >
> > > > def __repr__(self) -> str:
> > > > + """Returns string representation of a Test class object."""
> > > > return str(self)
> > > >
> > > > + def add_error(self, error_message: str) -> None:
> > > > + """Adds error to test object by incrementing the error count
> > > > + and printing the error message.
> > > > + """
> > >
> > > nit: this comment explains the low-level details of what the function
> > > does, which isn't as necessary.
> > >
> > > We'd want to document more what the intent of the function is, e.g. perhaps:
> > > Records an error that occured while parsing this test.
> > >
> > > In the future, we might want to change how errors are printed, hence
> > > why I don't want to include that in a comment, per se.
> > >
> > > E.g. I've seen a case where a user was getting truncated TAP output,
> > > but it was hard to tell.
> > > The error message was logged at the top but got lost after the parser
> > > went on to print out all the test results.
> > >
> > > The parser will behave the same way after this patch.
> > > So we might eventually want to have a follow-up that includes a
> > > summary of all the encountered errors at the end, for example.
> >
> > I like this change. I will update the docstring to be:
> > 'Records an error that occurred while parsing this test' in v3.
> >
> > >
> > > > + self.counts.errors += 1
> > > > + print_error('Test ' + self.name + ': ' + error_message)
> > > > +
> > > > class TestStatus(Enum):
> > > > + """An enumeration class to represent the status of a test."""
> > > > SUCCESS = auto()
> > > > FAILURE = auto()
> > > > SKIPPED = auto()
> > > > @@ -48,381 +74,769 @@ class TestStatus(Enum):
> > > > NO_TESTS = auto()
> > > > FAILURE_TO_PARSE_TESTS = auto()
> > > >
> > > > +class TestCounts:
> > > > + """
> > > > + A class to represent the counts of statuses and test errors of
> > > > + subtests or of the test itself if the test is a single test case with
> > > > + no subtests. Note that the sum of the counts of passed, failed,
> > > > + crashed, and skipped should sum to the total number of subtests for
> > > > + the test.
> > >
> > > optional: can tersen this a bit. e.g. I don't think we need to
> > > reiterate that this is a class, for example :)
> > > I'd personally write it a bit more like
> > >
> > > Tracks the number of tests that had each status.
> > > This includes the test itself and all its subtests.
> > >
> >
> > I agree this can be shortened. I will definitely be removing the
> > second sentence.
> > That can be described in the total() method. I will likely change the
> > docstring to be:
> > 'Tracks the counts of statuses of all test cases and any errors within a Test.'
> >
> > This correctly describes that the TestCounts object only tracks the
> > statuses of test
> > cases with no subtests. So if the test itself had subtests, it's
> > status would not be
> > counted. However, this does use the phrase 'test case', which we were attempting
> > to move away from. What do you think of this change?
> >
> > > > +
> > > > + Attributes:
> > > > + passed : int - the number of tests that have passed
> > > > + failed : int - the number of tests that have failed
> > > > + crashed : int - the number of tests that have crashed
> > > > + skipped : int - the number of tests that have skipped
> > > > + errors : int - the number of errors in the test and subtests
> > > > + """
> > > > + def __init__(self):
> > > > + """Contructs the default attributes of a TestCounts class
> > > > + object. Sets the counts of all test statuses and test
> > > > + errors to be 0.
> > > > + """
> > > > + self.passed = 0
> > > > + self.failed = 0
> > > > + self.crashed = 0
> > > > + self.skipped = 0
> > > > + self.errors = 0
> > > > +
> > > > + def __str__(self) -> str:
> > > > + """Returns the string representation of a TestCounts object.
> > > > + """
> > >
> > > Echoing the comment above, I think comments can be dropped for
> > > functions like __str__.
> >
> > See comment above on docstrings.
> >
> > >
> > > > + return ('Passed: ' + str(self.passed) +
> > > > + ', Failed: ' + str(self.failed) +
> > > > + ', Crashed: ' + str(self.crashed) +
> > > > + ', Skipped: ' + str(self.skipped) +
> > > > + ', Errors: ' + str(self.errors))
> > > > +
> > > > + def total(self) -> int:
> > > > + """Returns total number of subtests or 1 if the test object
> > > > + has no subtests to represent the test itself. This number is
> > > > + calculated by the sum of the passed, failed, crashed, and
> > > > + skipped subtests.
> > >
> > > I think the first sentence would be sufficient here, e.g.
> > > Returns the number of subtests, or 1 if the test had none.
> >
> > I will either just use the first sentence. Or I will change this to be:
> > 'Returns the total number of test cases within a test object.'
> > I think this more clearly depicts what this method returns.
> > I may add: 'where a test case is a test with no subtests.' See
> > above comment on class docstring. Again
> > is this an issue to be using the term test case?
> >
> > >
> > > > + """
> > > > + return (self.passed + self.failed + self.crashed +
> > > > + self.skipped)
> > > > +
> > > > + def add_subtest_counts(self, counts: TestCounts) -> None:
> > > > + """
> > > > + Adds the counts of another TestCounts object to the current
> > > > + TestCounts object. Used to add the counts of a subtest to the
> > > > + parent test.
> > > > +
> > > > + Parameters:
> > > > + counts - a different TestCounts object whose counts
> > > > + will be added to the counts of the TestCounts object
> > > > + """
> > > > + self.passed += counts.passed
> > > > + self.failed += counts.failed
> > > > + self.crashed += counts.crashed
> > > > + self.skipped += counts.skipped
> > > > + self.errors += counts.errors
> > > > +
> > > > + def get_status(self) -> TestStatus:
> > > > + """Returns the expected status of a Test using test counts."""
> > >
> > > nit: would "aggregated status" be a bit more accurate than "expected status" ?
> > >
> >
> > I like the change to "aggregated status". I will change this is v3 :)
> >
> > > > + if self.crashed:
> > > > + # If one of the subtests crash, the expected status
> > > > + # of the Test is crashed.
> > > > + return TestStatus.TEST_CRASHED
> > > > + elif self.failed:
> > > > + # Otherwise if one of the subtests fail, the
> > > > + # expected status of the Test is failed.
> > > > + return TestStatus.FAILURE
> > > > + elif self.passed:
> > > > + # Otherwise if one of the subtests pass, the
> > > > + # expected status of the Test is passed.
> > > > + return TestStatus.SUCCESS
> > > > + else:
> > > > + # Finally, if none of the subtests have failed,
> > > > + # crashed, or passed, the expected status of the
> > > > + # Test is skipped.
> > > > + return TestStatus.SKIPPED
> > > > +
> > > > + def add_status(self, status: TestStatus) -> None:
> > > > + """
> > > > + Given inputted status, increments corresponding attribute of
> > > > + TestCounts object.
> > > > +
> > > > + Parameters:
> > > > + status - status to be added to the TestCounts object
> > > > + """
> > > > + if status == TestStatus.SUCCESS or \
> > > > + status == TestStatus.NO_TESTS:
> > > > + # if status is NO_TESTS the most appropriate
> > > > + # attribute to increment is passed because
> > > > + # the test did not fail, crash or get skipped.
> > > > + self.passed += 1
> > > > + elif status == TestStatus.FAILURE:
> > > > + self.failed += 1
> > > > + elif status == TestStatus.SKIPPED:
> > > > + self.skipped += 1
> > > > + else:
> > > > + self.crashed += 1
> > > > +
> > > > class LineStream:
> > > > - """Provides a peek()/pop() interface over an iterator of (line#, text)."""
> > > > + """
> > > > + A class to represent the lines of kernel output.
> > > > + Provides a peek()/pop() interface over an iterator of
> > > > + (line#, text).
> > > > + """
> > > > _lines: Iterator[Tuple[int, str]]
> > > > _next: Tuple[int, str]
> > > > _done: bool
> > > >
> > > > def __init__(self, lines: Iterator[Tuple[int, str]]):
> > > > + """Set defaults for LineStream object and sets _lines
> > > > + attribute to lines parameter.
> > >
> > > nit: this "initializes" more than "set[s] defaults".
> > > Perhaps:
> > > Creates a new LineStream that wraps the given iterator.
> > >
> >
> > Thanks for this suggestion! I will definitely change this in v3.
> > I prefer this description much more.
> >
> > >
> > > > + """
> > > > self._lines = lines
> > > > self._done = False
> > > > self._next = (0, '')
> > > > self._get_next()
> > > >
> > > > def _get_next(self) -> None:
> > > > + """Advances the LineSteam to the next line or sets the _done
> > > > + attribute if the LineStream has reached the end of the lines.
> > > > + """
> > > > try:
> > > > self._next = next(self._lines)
> > > > except StopIteration:
> > > > self._done = True
> > > >
> > > > def peek(self) -> str:
> > > > + """Returns the next line in the LineStream without advancing
> > > > + the LineStream.
> > >
> > > Looks good to me, thanks!
> > >
> > > But perhaps saying "the current line" would be more clear?
> > >
> > > I.e.
> > > peek()
> > > Returns the current line, without advancing the LineStream.
> > >
> > > pop()
> > > Returns the current line and advances the LineStream to the next line.
> > >
> > > line_number()
> > > Returns the line number of the current line.
> > >
> >
> > I like all of these changes. Will change in v3.
> >
> > > > + """
> > > > return self._next[1]
> > > >
> > > > def pop(self) -> str:
> > > > + """Returns the next line in the LineStream and advances the
> > > > + LineStream to the next line.
> > > > + """
> > > > n = self._next
> > > > self._get_next()
> > > > return n[1]
> > > >
> > > > def __bool__(self) -> bool:
> > > > + """Returns whether the LineStream has reached the end of the
> > > > + lines.
> > > > + """
> > >
> > > Perhaps this (a bit shorter):
> > > Checks whether there's any more lines in the stream.
> >
> > I do think this could be shorter. However, I think 'checks' is a bit inexact.
> > I prefer 'Returns if stream has any more lines' or
> > 'Returns if stream is at end of lines.'
>
> These have opposite meanings. Does True mean there are moremy m
> lines, or there are no more lines? You should pick the wording
> that makes sense according to the value. I would recommend
> to include the word "True" in the description. As in:
> "Returns True if stream has more lines".
>
My mistake. Thanks for catching this! I like 'Returns True if stream
has more lines.'
> >
> > >
> > > > return not self._done
> > > >
> > > > # Only used by kunit_tool_test.py.
> > > > def __iter__(self) -> Iterator[str]:
> > > > + """Empties all lines stored in LineStream object into
> > > > + Iterator object and returns the Iterator object.
> > > > + """
> > >
> > > Nit: it doesn't really return an iterator object.
> > > Given this is another __ function, I think we can leave off the comment.
> > >
> > > The behavior is about what one would expect for __iter__().
> > >
> >
> > I think it is best to keep the simplistic docstrings for all public methods
> > (see comment above). However, I thought this function did return an Iterator.
> > I may be mistaken but since this method uses the yield keyword, this
> > function would return a generator, which is a type of iterator. Since I
> > would like to keep the docstring, could you explain further?
> >
> > > > while bool(self):
> > > > yield self.pop()
> > > >
> > > > def line_number(self) -> int:
> > > > + """Returns the line number of the next line in the
> > > > + LineStream.
> > > > + """
> > > > return self._next[0]
> > > >
> > > > -kunit_start_re = re.compile(r'TAP version [0-9]+$')
> > > > -kunit_end_re = re.compile('(List of all partitions:|'
> > > > - 'Kernel panic - not syncing: VFS:|reboot: System halted)')
> > > > +# Parsing helper methods:
> > > > +
> > > > +KTAP_START = re.compile(r'KTAP version ([0-9]+)$')
> > > > +TAP_START = re.compile(r'TAP version ([0-9]+)$')
> > > > +KTAP_END = re.compile('(List of all partitions:|'
> > > > + 'Kernel panic - not syncing: VFS:|reboot: System halted)')
> > > >
> > > > def extract_tap_lines(kernel_output: Iterable[str]) -> LineStream:
> > > > - def isolate_kunit_output(kernel_output: Iterable[str]) -> Iterator[Tuple[int, str]]:
> > > > + """Extracts KTAP lines from inputted kernel output in LineStream
> > > > + object."""
> > > > + def isolate_ktap_output(kernel_output: Iterable[str]) \
> > > > + -> Iterator[Tuple[int, str]]:
> > > > line_num = 0
> > > > started = False
> > > > for line in kernel_output:
> > > > line_num += 1
> > > > - line = line.rstrip() # line always has a trailing \n
> > > > - if kunit_start_re.search(line):
> > > > + line = line.rstrip() # remove trailing \n
> > > > + if not started and KTAP_START.search(line):
> > > > + # start extracting KTAP lines and set prefix
> > > > + # to number of characters before version line
> > > > + prefix_len = len(
> > > > + line.split('KTAP version')[0])
> > > > + started = True
> > > > + yield line_num, line[prefix_len:]
> > > > + elif not started and TAP_START.search(line):
> > > > + # start extracting KTAP lines and set prefix
> > > > + # to number of characters before version line
> > > > prefix_len = len(line.split('TAP version')[0])
> > > > started = True
> > > > yield line_num, line[prefix_len:]
> > > > - elif kunit_end_re.search(line):
> > > > + elif started and KTAP_END.search(line):
> > > > + # stop extracting KTAP lines
> > > > break
> > > > elif started:
> > > > - yield line_num, line[prefix_len:]
> > > > - return LineStream(lines=isolate_kunit_output(kernel_output))
> > > > -
> > > > -DIVIDER = '=' * 60
> > > > -
> > > > -RESET = '\033[0;0m'
> > > > -
> > > > -def red(text) -> str:
> > > > - return '\033[1;31m' + text + RESET> -
> > > > -def yellow(text) -> str:
> > > > - return '\033[1;33m' + text + RESET
> > > > -
> > > > -def green(text) -> str:
> > > > - return '\033[1;32m' + text + RESET
> > > > -
> > > > -def print_with_timestamp(message) -> None:
> > > > - print('[%s] %s' % (datetime.now().strftime('%H:%M:%S'), message))
> > > > -
> > > > -def format_suite_divider(message) -> str:
> > > > - return '======== ' + message + ' ========'
> > > > -
> > > > -def print_suite_divider(message) -> None:
> > > > - print_with_timestamp(DIVIDER)
> > > > - print_with_timestamp(format_suite_divider(message))
> > > > -
> > > > -def print_log(log) -> None:
> > > > - for m in log:
> > > > - print_with_timestamp(m)
> > > > -
> > > > -TAP_ENTRIES = re.compile(r'^(TAP|[\s]*ok|[\s]*not ok|[\s]*[0-9]+\.\.[0-9]+|[\s]*# (Subtest:|.*: kunit test case crashed!)).*$')
> > > > -
> > > > -def consume_non_diagnostic(lines: LineStream) -> None:
> > > > - while lines and not TAP_ENTRIES.match(lines.peek()):
> > > > - lines.pop()
> > > > -
> > > > -def save_non_diagnostic(lines: LineStream, test_case: TestCase) -> None:
> > > > - while lines and not TAP_ENTRIES.match(lines.peek()):
> > > > - test_case.log.append(lines.peek())
> > > > - lines.pop()
> > > > -
> > > > -OkNotOkResult = namedtuple('OkNotOkResult', ['is_ok','description', 'text'])
> > > > -
> > > > -OK_NOT_OK_SKIP = re.compile(r'^[\s]*(ok|not ok) [0-9]+ - (.*) # SKIP(.*)$')
> > > > -
> > > > -OK_NOT_OK_SUBTEST = re.compile(r'^[\s]+(ok|not ok) [0-9]+ - (.*)$')
> > > > -
> > > > -OK_NOT_OK_MODULE = re.compile(r'^(ok|not ok) ([0-9]+) - (.*)$')
> > > > -
> > > > -def parse_ok_not_ok_test_case(lines: LineStream, test_case: TestCase) -> bool:
> > > > - save_non_diagnostic(lines, test_case)
> > > > - if not lines:
> > > > - test_case.status = TestStatus.TEST_CRASHED
> > > > - return True
> > > > - line = lines.peek()
> > > > - match = OK_NOT_OK_SUBTEST.match(line)
> > > > - while not match and lines:
> > > > - line = lines.pop()
> > > > - match = OK_NOT_OK_SUBTEST.match(line)
> > > > - if match:
> > > > - test_case.log.append(lines.pop())
> > > > - test_case.name = match.group(2)
> > > > - skip_match = OK_NOT_OK_SKIP.match(line)
> > > > - if skip_match:
> > > > - test_case.status = TestStatus.SKIPPED
> > > > - return True
> > > > - if test_case.status == TestStatus.TEST_CRASHED:
> > > > - return True
> > > > - if match.group(1) == 'ok':
> > > > - test_case.status = TestStatus.SUCCESS
> > > > - else:
> > > > - test_case.status = TestStatus.FAILURE
> > > > - return True
> > > > + # remove prefix and any indention and yield
> > > > + # line with line number
> > > > + line = line[prefix_len:].lstrip()
> > > > + yield line_num, line
> > > > + return LineStream(lines=isolate_ktap_output(kernel_output))
> > > > +
> > > > +def raw_output(kernel_output: Iterable[str]) -> None:
> > > > + """Prints all lines of kernel output."""
> > > > + for line in kernel_output:
> > > > + print(line.rstrip())
> > >
> > > This accidentally adds back in the raw_output() function.
> > > We'll want to drop it, since it's no longer used by kunit.py.
> > >
> >
> > Great catch! Will remove this for v3. Didn't realize this was
> > supposed to be removed.
> >
> > > > +
> > > > +KTAP_VERSIONS = [1]
> > > > +TAP_VERSIONS = [13, 14]
> > > > +
> > > > +def check_version(version_num: int, accepted_versions: List[int],
> > > > + version_type: str, test: Test) -> None:
> > >
> > > Optional: we can make it clearer that this is an internal function by
> > > prefixing with a _
> > > E.g. def _check_version
> > >
> > > Same can go for all the other helpers here.
> > > pytype should be able to catch any missed names, so it should be low risk.
> > >
> > > But it's also fairly low reward, since we don't really have any other
> > > users, so the need to clamp down on what's "visible" to other packages
> > > is small.
> > >
> >
> > I might leave off the _ prefix because it would require almost all of the
> > methods to be prefixed. However, this is reasonable so if others think
> > this is necessary, I am happy to change all of the methods.
> >
> > > > + """
> > > > + Adds error to test object if version number is too high or too
> > > > + low.
> > > > +
> > > > + Parameters:
> > > > + version_num - The inputted version number from the parsed KTAP or TAP
> > > > + header line
> > > > + accepted_version - List of accepted KTAP or TAP versions
> > > > + version_type - 'KTAP' or 'TAP' depending on the type of
> > > > + version line.
> > > > + test - Test object for current test being parsed
> > > > + """
> > > > + if version_num < min(accepted_versions):
> > > > + test.add_error(version_type +
> > > > + ' version lower than expected!')
> > > > + elif version_num > max(accepted_versions):
> > > > + test.add_error(
> > > > + version_type + ' version higher than expected!')
> > > > +
> > > > +def parse_ktap_header(lines: LineStream, test: Test) -> bool:
> > > > + """
> > > > + If the next line in LineStream matches the format of KTAP or TAP
> > > > + header line, the version number is checked, the line is popped,
> > > > + and returns True. Otherwise the method returns False.
> > > > +
> > > > + Accepted formats:
> > > > + - 'KTAP version [version number]'
> > > > + - 'TAP version [version number]'
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of KTAP output to parse
> > > > + test - Test object for current test being parsed
> > > > +
> > > > + Return:
> > > > + Boolean that represents if the next line in the LineStream was parsed
> > > > + as the KTAP or TAP header line
> > >
> > > I think we can simplify these "Boolean that represents" with
> > >
> > > Return:
> > > True if we parsed a KTAP or header line
> > >
> >
> > I like this change a lot. I was struggling to get the right wording
> > with the methods
> > that returned booleans. I will change this for v3.
> >
> > > > + """
> > > > + ktap_match = KTAP_START.match(lines.peek())
> > > > + tap_match = TAP_START.match(lines.peek())
> > > > + if ktap_match:
> > > > + version_num = int(ktap_match.group(1))
> > > > + check_version(version_num, KTAP_VERSIONS, 'KTAP', test)
> > > > + elif tap_match:
> > > > + version_num = int(tap_match.group(1))
> > > > + check_version(version_num, TAP_VERSIONS, 'TAP', test)
> > > > else:
> > > > return False
> > > > -
> > > > -SUBTEST_DIAGNOSTIC = re.compile(r'^[\s]+# (.*)$')
> > > > -DIAGNOSTIC_CRASH_MESSAGE = re.compile(r'^[\s]+# .*?: kunit test case crashed!$')
> > > > -
> > > > -def parse_diagnostic(lines: LineStream, test_case: TestCase) -> bool:
> > > > - save_non_diagnostic(lines, test_case)
> > > > - if not lines:
> > > > + test.log.append(lines.pop())
> > > > + return True
> > > > +
> > > > +TEST_HEADER = re.compile(r'^# Subtest: (.*)$')
> > > > +
> > > > +def parse_test_header(lines: LineStream, test: Test) -> bool:
> > > > + """
> > > > + If the next line in LineStream matches the format of a test
> > > > + header line, the name of test is set, the line is popped,
> > > > + and returns True. Otherwise the method returns False.
> > > > +
> > > > + Accepted format:
> > > > + - '# Subtest: [test name]'
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of ktap output to parse
> > > > + test - Test object for current test being parsed
> > > > +
> > > > + Return:
> > > > + Boolean that represents if the next line in the LineStream was parsed
> > > > + as a test header
> > >
> > > ditto above, this could be
> > > True if we parsed a test header line.
> >
> > See above. Will change this for v3.
> >
> > >
> > > > + """
> > > > + match = TEST_HEADER.match(lines.peek())
> > > > + if not match:
> > > > return False
> > > > + test.log.append(lines.pop())
> > > > + test.name = match.group(1)
> > > > + return True
> > > > +
> > > > +TEST_PLAN = re.compile(r'1\.\.([0-9]+)')
> > > > +
> > > > +def parse_test_plan(lines: LineStream, test: Test) -> bool:
> > > > + """
> > > > + If the next line in LineStream matches the format of a test
> > > > + plan line, the expected number of subtests is set in test object, an
> > > > + error is thrown if there are 0 tests, the line is popped,
> > > > + and returns True. Otherwise the method adds an error that the test
> > > > + plan is missing to the test object and returns False.
> > >
> > > nit: "missing to the test object" => missing for?
> > >
> > > Perhaps we can rewrite this as something more like:
> > >
> > > Parses a test plan and stores the expected number of subtests in `test`.
> > > Returns False if the current line doesn't look like a test plan.
> > >
> > > It reports an error if the expected count is 0.
> > >
> >
> > I definitely agree that 'missing for' is better than 'missing to'.
> > However, overall
> > this comment does seem confusing and does not match some of the updated
> > docstrings. This confusing format is shared by all of the parsing methods.
> > Thus, I would like to update the parsing method docstrings in v3. For example,
> > this docstring would be changed to:
> >
> > Parses test plan line and stores the expected number of subtests in `test`.
> > Reports an error if expected count is 0.
> > Returns False and reports missing test plan error if fails to parse test plan.
> >
> > > > +
> > > > + Accepted format:
> > > > + - '1..[number of subtests]'
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of ktap output to parse
> > > > + test - Test object for current test being parsed
> > > > +
> > > > + Return:
> > > > + Boolean that represents if the next line in the LineStream was parsed
> > > > + as a test plan
> > > > + """
> > > > + 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))
> > > > + test.expected_count = expected_count
> > > > + if expected_count == 0:
> > > > + test.status = TestStatus.NO_TESTS
> > > > + test.add_error('0 tests run!')
> > > > + return True
> > > > +
> > > > +TEST_RESULT = re.compile(r'^(ok|not ok) ([0-9]+) (- )?(.*)$')
> > > > +
> > > > +TEST_RESULT_SKIP = re.compile(r'^(ok|not ok) ([0-9]+) (- )?(.*) # SKIP(.*)$')
> > > > +
> > > > +def peek_test_name_match(lines: LineStream, test: Test) -> bool:
> > > > + """
> > > > + If the next line in LineStream matches the format of a test
> > > > + result line and the name of the result line matches the name of the
> > > > + current test, the method returns True. Otherwise it returns False.
> > > > +
> > > > + Accepted format:
> > > > + - '[ok|not ok] [test number] [-] [test name] [optional skip
> > > > + directive]'
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of KTAP output to parse
> > > > + test - Test object for current test being parsed
> > > > +
> > > > + Return:
> > > > + Boolean that represents if the next line in the LineStream matched a
> > > > + test result line and the name matched the expected test name
> > > > + """
> > > > line = lines.peek()
> > > > - match = SUBTEST_DIAGNOSTIC.match(line)
> > > > - if match:
> > > > - test_case.log.append(lines.pop())
> > > > - crash_match = DIAGNOSTIC_CRASH_MESSAGE.match(line)
> > > > - if crash_match:
> > > > - test_case.status = TestStatus.TEST_CRASHED
> > > > - return True
> > > > - else:
> > > > + match = TEST_RESULT.match(line)
> > > > + if not match:
> > > > return False
> > > > + name = match.group(4)
> > > > + return (name == test.name)
> > > > +
> > > > +def parse_test_result(lines: LineStream, test: Test,
> > > > + expected_num: int) -> bool:
> > > > + """
> > > > + If the next line in LineStream matches the format of a test
> > > > + result line, the status in the result line is added to the test
> > > > + object, the test number is checked to match the expected test number
> > > > + and if not an error is added to the test object, and returns True.
> > > > + Otherwise it returns False.
> > > > +
> > > > + Note that the skip diirective is the only
> > >
> > > nit: diir => dir
> > >
> >
> > Oops. Thanks for catching that. Will change in v3.
> >
> > >
> > > > + directive that causes a change in status and otherwise the directive
> > > > + is included in the name of the test.
> > > > +
> > > > + Accepted format:
> > > > + - '[ok|not ok] [test number] [-] [test name] [optional skip
> > > > + directive]'
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of KTAP output to parse
> > > > + test - Test object for current test being parsed
> > > > + expected_num - expected test number for current test
> > > > +
> > > > + Return:
> > > > + Boolean that represents if the next line in the LineStream was parsed
> > > > + as a test result line.
> > > > + """
> > > > + line = lines.peek()
> > > > + match = TEST_RESULT.match(line)
> > > > + skip_match = TEST_RESULT_SKIP.match(line)
> > > >
> > > > -def parse_test_case(lines: LineStream) -> Optional[TestCase]:
> > > > - test_case = TestCase()
> > > > - save_non_diagnostic(lines, test_case)
> > > > - while parse_diagnostic(lines, test_case):
> > > > - pass
> > > > - if parse_ok_not_ok_test_case(lines, test_case):
> > > > - return test_case
> > > > - else:
> > > > - return None
> > > > -
> > > > -SUBTEST_HEADER = re.compile(r'^[\s]+# Subtest: (.*)$')
> > > > + # Check if line matches test result line format
> > > > + if not match:
> > > > + return False
> > > > + test.log.append(lines.pop())
> > > >
> > > > -def parse_subtest_header(lines: LineStream) -> Optional[str]:
> > > > - consume_non_diagnostic(lines)
> > > > - if not lines:
> > > > - return None
> > > > - match = SUBTEST_HEADER.match(lines.peek())
> > > > - if match:
> > > > - lines.pop()
> > > > - return match.group(1)
> > > > + # Set name of test object
> > > > + if skip_match:
> > > > + test.name = skip_match.group(4)
> > > > else:
> > > > - return None
> > > > + test.name = match.group(4)
> > > >
> > > > -SUBTEST_PLAN = re.compile(r'[\s]+[0-9]+\.\.([0-9]+)')
> > > > + # Check test num
> > > > + num = int(match.group(2))
> > > > + if num != expected_num:
> > > > + test.add_error('Expected test number ' +
> > > > + str(expected_num) + ' but found ' + str(num))
> > > >
> > > > -def parse_subtest_plan(lines: LineStream) -> Optional[int]:
> > > > - consume_non_diagnostic(lines)
> > > > - match = SUBTEST_PLAN.match(lines.peek())
> > > > - if match:
> > > > - lines.pop()
> > > > - return int(match.group(1))
> > > > - else:
> > > > - return None
> > > > -
> > > > -def max_status(left: TestStatus, right: TestStatus) -> TestStatus:
> > > > - if left == right:
> > > > - return left
> > > > - elif left == TestStatus.TEST_CRASHED or right == TestStatus.TEST_CRASHED:
> > > > - return TestStatus.TEST_CRASHED
> > > > - elif left == TestStatus.FAILURE or right == TestStatus.FAILURE:
> > > > - return TestStatus.FAILURE
> > > > - elif left == TestStatus.SKIPPED:
> > > > - return right
> > > > - else:
> > > > - return left
> > > > -
> > > > -def parse_ok_not_ok_test_suite(lines: LineStream,
> > > > - test_suite: TestSuite,
> > > > - expected_suite_index: int) -> bool:
> > > > - consume_non_diagnostic(lines)
> > > > - if not lines:
> > > > - test_suite.status = TestStatus.TEST_CRASHED
> > > > - return False
> > > > - line = lines.peek()
> > > > - match = OK_NOT_OK_MODULE.match(line)
> > > > - if match:
> > > > - lines.pop()
> > > > - if match.group(1) == 'ok':
> > > > - test_suite.status = TestStatus.SUCCESS
> > > > - else:
> > > > - test_suite.status = TestStatus.FAILURE
> > > > - skip_match = OK_NOT_OK_SKIP.match(line)
> > > > - if skip_match:
> > > > - test_suite.status = TestStatus.SKIPPED
> > > > - suite_index = int(match.group(2))
> > > > - if suite_index != expected_suite_index:
> > > > - print_with_timestamp(
> > > > - red('[ERROR] ') + 'expected_suite_index ' +
> > > > - str(expected_suite_index) + ', but got ' +
> > > > - str(suite_index))
> > > > + # Set status of test object
> > > > + status = match.group(1)
> > > > + if test.status == TestStatus.TEST_CRASHED:
> > > > return True
> > > > + elif skip_match:
> > > > + test.status = TestStatus.SKIPPED
> > > > + elif status == 'ok':
> > > > + test.status = TestStatus.SUCCESS
> > > > else:
> > > > - return False
> > > > -
> > > > -def bubble_up_errors(status_list: Iterable[TestStatus]) -> TestStatus:
> > > > - return reduce(max_status, status_list, TestStatus.SKIPPED)
> > > > + test.status = TestStatus.FAILURE
> > > > + return True
> > > > +
> > > > +def parse_diagnostic(lines: LineStream) -> List[str]:
> > > > + """
> > > > + If the next line in LineStream does not match the format of a test
> > > > + case line or test header line, the line is checked if the test has
> > > > + crashed and if so adds an error message, pops the line and adds it to
> > > > + the log.
> > > > +
> > > > + Line formats that are not parsed:
> > > > + - '# Subtest: [test name]'
> > > > + - '[ok|not ok] [test number] [-] [test name] [optional skip
> > > > + directive]'
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of KTAP output to parse
> > > > +
> > > > + Return:
> > > > + Log of diagnostic lines
> > > > + """
> > > > + log = [] # type: List[str]
> > > > + while lines and not TEST_RESULT.match(lines.peek()) and not \
> > > > + TEST_HEADER.match(lines.peek()):
> > > > + log.append(lines.pop())
> > > > + return log
> > > > +
> > > > +DIAGNOSTIC_CRASH_MESSAGE = re.compile(r'^# .*?: kunit test case crashed!$')
> > > > +
> > > > +def parse_crash_in_log(test: Test) -> bool:
> > > > + """
> > > > + Iterate through the lines of the log to parse for crash message.
> > > > + If crash message found, set status to crashed and return True.
> > > > + Otherwise return False.
> > > > +
> > > > + Parameters:
> > > > + test - Test object for current test being parsed
> > > > +
> > > > + Return:
> > > > + Boolean that represents if crash message found in log
> > > > + """
> > > > + for line in test.log:
> > > > + if DIAGNOSTIC_CRASH_MESSAGE.match(line):
> > > > + test.status = TestStatus.TEST_CRASHED
> > > > + return True
> > > > + return False
> > > >
> > > > -def bubble_up_test_case_errors(test_suite: TestSuite) -> TestStatus:
> > > > - max_test_case_status = bubble_up_errors(x.status for x in test_suite.cases)
> > > > - return max_status(max_test_case_status, test_suite.status)
> > > > +# Printing helper methods:
> > > >
> > > > -def parse_test_suite(lines: LineStream, expected_suite_index: int) -> Optional[TestSuite]:
> > > > - if not lines:
> > > > - return None
> > > > - consume_non_diagnostic(lines)
> > > > - test_suite = TestSuite()
> > > > - test_suite.status = TestStatus.SUCCESS
> > > > - name = parse_subtest_header(lines)
> > > > - if not name:
> > > > - return None
> > > > - test_suite.name = name
> > > > - expected_test_case_num = parse_subtest_plan(lines)
> > > > - if expected_test_case_num is None:
> > > > - return None
> > > > - while expected_test_case_num > 0:
> > > > - test_case = parse_test_case(lines)
> > > > - if not test_case:
> > > > - break
> > > > - test_suite.cases.append(test_case)
> > > > - expected_test_case_num -= 1
> > > > - if parse_ok_not_ok_test_suite(lines, test_suite, expected_suite_index):
> > > > - test_suite.status = bubble_up_test_case_errors(test_suite)
> > > > - return test_suite
> > > > - elif not lines:
> > > > - print_with_timestamp(red('[ERROR] ') + 'ran out of lines before end token')
> > > > - return test_suite
> > > > - else:
> > > > - print(f'failed to parse end of suite "{name}", at line {lines.line_number()}: {lines.peek()}')
> > > > - return None
> > > > +DIVIDER = '=' * 60
> > > >
> > > > -TAP_HEADER = re.compile(r'^TAP version 14$')
> > > > +RESET = '\033[0;0m'
> > > >
> > > > -def parse_tap_header(lines: LineStream) -> bool:
> > > > - consume_non_diagnostic(lines)
> > > > - if TAP_HEADER.match(lines.peek()):
> > > > - lines.pop()
> > > > - return True
> > > > - else:
> > > > - return False
> > > > +def red(text: str) -> str:
> > > > + """Returns inputted string with red color code."""
> > > > + return '\033[1;31m' + text + RESET
> > > >
> > > > -TEST_PLAN = re.compile(r'[0-9]+\.\.([0-9]+)')
> > > > +def yellow(text: str) -> str:
> > > > + """Returns inputted string with yellow color code."""
> > > > + return '\033[1;33m' + text + RESET
> > > >
> > > > -def parse_test_plan(lines: LineStream) -> Optional[int]:
> > > > - consume_non_diagnostic(lines)
> > > > - match = TEST_PLAN.match(lines.peek())
> > > > - if match:
> > > > - lines.pop()
> > > > - return int(match.group(1))
> > > > - else:
> > > > - return None
> > > > -
> > > > -def bubble_up_suite_errors(test_suites: Iterable[TestSuite]) -> TestStatus:
> > > > - return bubble_up_errors(x.status for x in test_suites)
> > > > -
> > > > -def parse_test_result(lines: LineStream) -> TestResult:
> > > > - consume_non_diagnostic(lines)
> > > > - if not lines or not parse_tap_header(lines):
> > > > - return TestResult(TestStatus.FAILURE_TO_PARSE_TESTS, [], lines)
> > > > - expected_test_suite_num = parse_test_plan(lines)
> > > > - if expected_test_suite_num == 0:
> > > > - return TestResult(TestStatus.NO_TESTS, [], lines)
> > > > - elif expected_test_suite_num is None:
> > > > - return TestResult(TestStatus.FAILURE_TO_PARSE_TESTS, [], lines)
> > > > - test_suites = []
> > > > - for i in range(1, expected_test_suite_num + 1):
> > > > - test_suite = parse_test_suite(lines, i)
> > > > - if test_suite:
> > > > - test_suites.append(test_suite)
> > > > - else:
> > > > - print_with_timestamp(
> > > > - red('[ERROR] ') + ' expected ' +
> > > > - str(expected_test_suite_num) +
> > > > - ' test suites, but got ' + str(i - 2))
> > > > - break
> > > > - test_suite = parse_test_suite(lines, -1)
> > > > - if test_suite:
> > > > - print_with_timestamp(red('[ERROR] ') +
> > > > - 'got unexpected test suite: ' + test_suite.name)
> > > > - if test_suites:
> > > > - return TestResult(bubble_up_suite_errors(test_suites), test_suites, lines)
> > > > - else:
> > > > - return TestResult(TestStatus.NO_TESTS, [], lines)
> > > > +def green(text: str) -> str:
> > > > + """Returns inputted string with green color code."""
> > > > + return '\033[1;32m' + text + RESET
> > > >
> > > > -class TestCounts:
> > > > - passed: int
> > > > - failed: int
> > > > - crashed: int
> > > > - skipped: int
> > > > +ANSI_LEN = len(red(''))
> > > >
> > > > - def __init__(self):
> > > > - self.passed = 0
> > > > - self.failed = 0
> > > > - self.crashed = 0
> > > > - self.skipped = 0
> > > > +def print_with_timestamp(message: str) -> None:
> > > > + """Prints message with timestamp at beginning."""
> > > > + print('[%s] %s' % (datetime.now().strftime('%H:%M:%S'), message))
> > > >
> > > > - def total(self) -> int:
> > > > - return self.passed + self.failed + self.crashed + self.skipped
> > > > -
> > > > -def print_and_count_results(test_result: TestResult) -> TestCounts:
> > > > - counts = TestCounts()
> > > > - for test_suite in test_result.suites:
> > > > - if test_suite.status == TestStatus.SUCCESS:
> > > > - print_suite_divider(green('[PASSED] ') + test_suite.name)
> > > > - elif test_suite.status == TestStatus.SKIPPED:
> > > > - print_suite_divider(yellow('[SKIPPED] ') + test_suite.name)
> > > > - elif test_suite.status == TestStatus.TEST_CRASHED:
> > > > - print_suite_divider(red('[CRASHED] ' + test_suite.name))
> > > > +def format_test_divider(message: str, len_message: int) -> str:
> > > > + """
> > > > + Returns string with message centered in fixed width divider.
> > > > +
> > > > + Example:
> > > > + '===================== message example ====================='
> > > > +
> > > > + Parameters:
> > > > + message - message to be centered in divider line
> > > > + len_message - length of the message to be printed such that
> > > > + any characters of the color codes are not counted
> > > > +
> > > > + Return:
> > > > + String containing message centered in fixed width divider
> > > > + """
> > > > + default_count = 3 # default number of dashes
> > > > + len_1 = default_count
> > > > + len_2 = default_count
> > > > + difference = len(DIVIDER) - len_message - 2 # 2 spaces added
> > > > + if difference > 0:
> > > > + # calculate number of dashes for each side of the divider
> > > > + len_1 = int(difference / 2)
> > > > + len_2 = difference - len_1
> > > > + return ('=' * len_1) + ' ' + message + ' ' + ('=' * len_2)
> > > > +
> > > > +def print_test_header(test: Test) -> None:
> > > > + """
> > > > + Prints test header with test name and optionally the expected number
> > > > + of subtests.
> > > > +
> > > > + Example:
> > > > + '=================== example (2 subtests) ==================='
> > > > +
> > > > + Parameters:
> > > > + test - Test object representing current test being printed
> > > > + """
> > > > + message = test.name
> > > > + if test.expected_count:
> > > > + message += ' (' + str(test.expected_count) + ' subtests)'
> > > > + print_with_timestamp(format_test_divider(message, len(message)))
> > > > +
> > > > +def print_log(log: Iterable[str]) -> None:
> > > > + """
> > > > + Prints all strings in saved log for test in yellow.
> > > > +
> > > > + Parameters:
> > > > + log - Iterable object with all strings saved in log for test
> > > > + """
> > > > + for m in log:
> > > > + print_with_timestamp(yellow(m))
> > > > + print_with_timestamp('')
> > > > +
> > > > +def format_test_result(test: Test) -> str:
> > > > + """
> > > > + Returns string with formatted test result with colored status and test
> > > > + name.
> > > > +
> > > > + Example:
> > > > + '[PASSED] example'
> > > > +
> > > > + Parameters:
> > > > + test - Test object representing current test being printed
> > > > +
> > > > + Return:
> > > > + String containing formatted test result
> > > > + """
> > > > + if test.status == TestStatus.SUCCESS:
> > > > + return (green('[PASSED] ') + test.name)
> > > > + elif test.status == TestStatus.SKIPPED:
> > > > + return (yellow('[SKIPPED] ') + test.name)
> > > > + elif test.status == TestStatus.TEST_CRASHED:
> > > > + print_log(test.log)
> > > > + return (red('[CRASHED] ') + test.name)
> > > > + else:
> > > > + print_log(test.log)
> > > > + return (red('[FAILED] ') + test.name)
> > > > +
> > > > +def print_test_result(test: Test) -> None:
> > > > + """
> > > > + Prints result line with status of test.
> > > > +
> > > > + Example:
> > > > + '[PASSED] example'
> > > > +
> > > > + Parameters:
> > > > + test - Test object representing current test being printed
> > > > + """
> > > > + print_with_timestamp(format_test_result(test))
> > > > +
> > > > +def print_test_footer(test: Test) -> None:
> > > > + """
> > > > + Prints test footer with status of test.
> > > > +
> > > > + Example:
> > > > + '===================== [PASSED] example ====================='
> > > > +
> > > > + Parameters:
> > > > + test - Test object representing current test being printed
> > > > + """
> > > > + message = format_test_result(test)
> > > > + print_with_timestamp(format_test_divider(message,
> > > > + len(message) - ANSI_LEN))
> > > > +
> > > > +def print_summary_line(test: Test) -> None:
> > > > + """
> > > > + Prints summary line of test object. Color of line is dependent on
> > > > + status of test. Color is green if test passes, yellow if test is
> > > > + skipped, and red if the test fails or crashes. Summary line contains
> > > > + counts of the statuses of the tests subtests or the test itself if it
> > > > + has no subtests.
> > > > +
> > > > + Example:
> > > > + "Testing complete. Passed: 2, Failed: 0, Crashed: 0, Skipped: 0,
> > > > + Errors: 0"
> > > > +
> > > > + test - Test object representing current test being printed
> > > > + """
> > > > + if test.status == TestStatus.SUCCESS or \
> > > > + test.status == TestStatus.NO_TESTS:
> > > > + color = green
> > > > + elif test.status == TestStatus.SKIPPED:
> > > > + color = yellow
> > > > + else:
> > > > + color = red
> > > > + counts = test.counts
> > > > + print_with_timestamp(color('Testing complete. ' + str(counts)))
> > > > +
> > > > +def print_error(error_message: str) -> None:
> > > > + """
> > > > + Prints error message with error format.
> > > > +
> > > > + Example:
> > > > + "[ERROR] Test example: missing test plan!"
> > > > +
> > > > + Parameters:
> > > > + error_message - message describing error
> > > > + """
> > > > + print_with_timestamp(red('[ERROR] ') + error_message)
> > > > +
> > > > +# Other methods:
> > > > +
> > > > +def bubble_up_test_results(test: Test) -> None:
> > > > + """
> > > > + If the test has subtests, add the test counts of the subtests to the
> > > > + test and check if any of the tests crashed and if so set the test
> > > > + status to crashed. Otherwise if the test has no subtests add the
> > > > + status of the test to the test counts.
> > > > +
> > > > + Parameters:
> > > > + test - Test object for current test being parsed
> > > > + """
> > > > + parse_crash_in_log(test)
> > > > + subtests = test.subtests
> > > > + counts = test.counts
> > > > + status = test.status
> > > > + for t in subtests:
> > > > + counts.add_subtest_counts(t.counts)
> > > > + if counts.total() == 0:
> > > > + counts.add_status(status)
> > > > + elif test.counts.get_status() == TestStatus.TEST_CRASHED:
> > > > + test.status = TestStatus.TEST_CRASHED
> > > > +
> > > > +def parse_test(lines: LineStream, expected_num: int, log: List[str]) -> Test:
> > > > + """
> > > > + Finds next test to parse in LineStream, creates new Test object,
> > > > + parses any subtests of the test, populates Test object with all
> > > > + information (status, name) about the test and the Test objects for
> > > > + any subtests, and then returns the Test object. The method accepts
> > > > + three formats of tests:
> > > > +
> > > > + Accepted test formats:
> > > > +
> > > > + - Main KTAP/TAP header
> > > > +
> > > > + Example:
> > > > +
> > > > + KTAP version 1
> > > > + 1..4
> > > > + [subtests]
> > > > +
> > > > + - Subtest header line
> > > > +
> > > > + Example:
> > > > +
> > > > + # Subtest: name
> > > > + 1..3
> > > > + [subtests]
> > > > + ok 1 name
> > > > +
> > > > + - Test result line
> > > > +
> > > > + Example:
> > > > +
> > > > + ok 1 - test
> > > > +
> > > > + Parameters:
> > > > + lines - LineStream of KTAP output to parse
> > > > + expected_num - expected test number for test to be parsed
> > > > + log - list of strings containing any preceding diagnostic lines
> > > > + corresponding to the current test
> > > > +
> > > > + Return:
> > > > + Test object populated with characteristics and any subtests
> > > > + """
> > > > + test = Test()
> > > > + test.log.extend(log)
> > > > + parent_test = False
> > > > + main = parse_ktap_header(lines, test)
> > > > + if main:
> > > > + # If KTAP/TAP header is found, attempt to parse
> > > > + # test plan
> > > > + test.name = "main"
> > > > + parse_test_plan(lines, test)
> > > > + else:
> > > > + # If KTAP/TAP header is not found, test must be subtest
> > > > + # header or test result line so parse attempt to parser
> > > > + # subtest header
> > > > + parent_test = parse_test_header(lines, test)
> > > > + if parent_test:
> > > > + # If subtest header is found, attempt to parse
> > > > + # test plan and print header
> > > > + parse_test_plan(lines, test)
> > > > + print_test_header(test)
> > > > + expected_count = test.expected_count
> > > > + subtests = []
> > > > + test_num = 1
> > > > + while main or expected_count is None or test_num <= expected_count:
> > > > + # Loop to parse any subtests.
> > > > + # If test is main test, do not break until no lines left.
> > > > + # Otherwise, break after parsing expected number of tests or
> > > > + # if expected number of tests is unknown break when found
> > > > + # test result line with matching name to subtest header.
> > > > + if not lines:
> > > > + if expected_count and test_num <= expected_count:
> > > > + test.add_error('missing expected subtests!')
> > > > + break
> > > > + sub_log = parse_diagnostic(lines)
> > > > + if not expected_count and not main and \
> > > > + peek_test_name_match(lines, test):
> > > > + test.log.extend(sub_log)
> > > > + break
> > > > + subtests.append(parse_test(lines, test_num, sub_log))
> > > > + test_num += 1
> > > > + test.subtests = subtests
> > > > + if not main:
> > > > + # If not main test, look for test result line
> > > > + test.log.extend(parse_diagnostic(lines))
> > > > + if (parent_test and peek_test_name_match(lines, test)) or \
> > > > + not parent_test:
> > > > + parse_test_result(lines, test, expected_num)
> > > > else:
> > > > - print_suite_divider(red('[FAILED] ') + test_suite.name)
> > > > - for test_case in test_suite.cases:
> > > > - if test_case.status == TestStatus.SUCCESS:
> > > > - counts.passed += 1
> > > > - print_with_timestamp(green('[PASSED] ') + test_case.name)
> > > > - elif test_case.status == TestStatus.SKIPPED:
> > > > - counts.skipped += 1
> > > > - print_with_timestamp(yellow('[SKIPPED] ') + test_case.name)
> > > > - elif test_case.status == TestStatus.TEST_CRASHED:
> > > > - counts.crashed += 1
> > > > - print_with_timestamp(red('[CRASHED] ' + test_case.name))
> > > > - print_log(map(yellow, test_case.log))
> > > > - print_with_timestamp('')
> > > > - else:
> > > > - counts.failed += 1
> > > > - print_with_timestamp(red('[FAILED] ') + test_case.name)
> > > > - print_log(map(yellow, test_case.log))
> > > > - print_with_timestamp('')
> > > > - return counts
> > > > + test.add_error('missing subtest result line!')
> > > > + # Add statuses to TestCounts attribute in Test object
> > > > + bubble_up_test_results(test)
> > > > + if parent_test:
> > > > + # If test has subtests and is not the main test object, print
> > > > + # footer.
> > > > + print_test_footer(test)
> > > > + elif not main:
> > > > + print_test_result(test)
> > > > + return test
> > > >
> > > > def parse_run_tests(kernel_output: Iterable[str]) -> TestResult:
> > > > - counts = TestCounts()
> > > > + """
> > > > + Using kernel output, extract KTAP lines, parse the lines for test
> > > > + results and print condensed test results and summary line .
> > > > +
> > > > + Parameters:
> > > > + kernel_output - Iterable object contains lines of kernel output
> > > > +
> > > > + Return:
> > > > + TestResult - Tuple containg status of main test object, main test
> > > > + object with all subtests, and log of all KTAP lines.
> > > > + """
> > > > + print_with_timestamp(DIVIDER)
> > > > lines = extract_tap_lines(kernel_output)
> > > > - test_result = parse_test_result(lines)
> > > > - if test_result.status == TestStatus.NO_TESTS:
> > > > - print(red('[ERROR] ') + yellow('no tests run!'))
> > > > - elif test_result.status == TestStatus.FAILURE_TO_PARSE_TESTS:
> > > > - print(red('[ERROR] ') + yellow('could not parse test results!'))
> > > > + test = Test()
> > > > + if not lines:
> > > > + test.add_error('invalid KTAP input!')
> > > > + test.status = TestStatus.FAILURE_TO_PARSE_TESTS
> > > > else:
> > > > - counts = print_and_count_results(test_result)
> > > > + test = parse_test(lines, 0, [])
> > > > + if test.status != TestStatus.NO_TESTS:
> > > > + test.status = test.counts.get_status()
> > > > print_with_timestamp(DIVIDER)
> > > > - if test_result.status == TestStatus.SUCCESS:
> > > > - fmt = green
> > > > - elif test_result.status == TestStatus.SKIPPED:
> > > > - fmt = yellow
> > > > - else:
> > > > - fmt =red
> > > > - print_with_timestamp(
> > > > - fmt('Testing complete. %d tests run. %d failed. %d crashed. %d skipped.' %
> > > > - (counts.total(), counts.failed, counts.crashed, counts.skipped)))
> > > > - return test_result
> > > > + print_summary_line(test)
> > > > + return TestResult(test.status, test, lines)
> > > > diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py
> > > > index 619c4554cbff..e527b90de8ea 100755
> > > > --- a/tools/testing/kunit/kunit_tool_test.py
> > > > +++ b/tools/testing/kunit/kunit_tool_test.py
> > > > @@ -106,10 +106,10 @@ class KUnitParserTest(unittest.TestCase):
> > > > with open(log_path) as file:
> > > > result = kunit_parser.extract_tap_lines(file.readlines())
> > > > self.assertContains('TAP version 14', result)
> > > > - self.assertContains(' # Subtest: example', result)
> > > > - self.assertContains(' 1..2', result)
> > > > - self.assertContains(' ok 1 - example_simple_test', result)
> > > > - self.assertContains(' ok 2 - example_mock_test', result)
> > > > + self.assertContains('# Subtest: example', result)
> > > > + self.assertContains('1..2', result)
> > > > + self.assertContains('ok 1 - example_simple_test', result)
> > > > + self.assertContains('ok 2 - example_mock_test', result)
> > > > self.assertContains('ok 1 - example', result)
> > > >
> > > > def test_output_with_prefix_isolated_correctly(self):
> > > > @@ -117,28 +117,28 @@ class KUnitParserTest(unittest.TestCase):
> > > > with open(log_path) as file:
> > > > result = kunit_parser.extract_tap_lines(file.readlines())
> > > > self.assertContains('TAP version 14', result)
> > > > - self.assertContains(' # Subtest: kunit-resource-test', result)
> > > > - self.assertContains(' 1..5', result)
> > > > - self.assertContains(' ok 1 - kunit_resource_test_init_resources', result)
> > > > - self.assertContains(' ok 2 - kunit_resource_test_alloc_resource', result)
> > > > - self.assertContains(' ok 3 - kunit_resource_test_destroy_resource', result)
> > > > - self.assertContains(' foo bar #', result)
> > > > - self.assertContains(' ok 4 - kunit_resource_test_cleanup_resources', result)
> > > > - self.assertContains(' ok 5 - kunit_resource_test_proper_free_ordering', result)
> > > > + self.assertContains('# Subtest: kunit-resource-test', result)
> > > > + self.assertContains('1..5', result)
> > > > + self.assertContains('ok 1 - kunit_resource_test_init_resources', result)
> > > > + self.assertContains('ok 2 - kunit_resource_test_alloc_resource', result)
> > > > + self.assertContains('ok 3 - kunit_resource_test_destroy_resource', result)
> > > > + self.assertContains('foo bar #', result)
> > > > + self.assertContains('ok 4 - kunit_resource_test_cleanup_resources', result)
> > > > + self.assertContains('ok 5 - kunit_resource_test_proper_free_ordering', result)
> > > > self.assertContains('ok 1 - kunit-resource-test', result)
> > > > - self.assertContains(' foo bar # non-kunit output', result)
> > > > - self.assertContains(' # Subtest: kunit-try-catch-test', result)
> > > > - self.assertContains(' 1..2', result)
> > > > - self.assertContains(' ok 1 - kunit_test_try_catch_successful_try_no_catch',
> > > > + self.assertContains('foo bar # non-kunit output', result)
> > > > + self.assertContains('# Subtest: kunit-try-catch-test', result)
> > > > + self.assertContains('1..2', result)
> > > > + self.assertContains('ok 1 - kunit_test_try_catch_successful_try_no_catch',
> > > > result)
> > > > - self.assertContains(' ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch',
> > > > + self.assertContains('ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch',
> > > > result)
> > > > self.assertContains('ok 2 - kunit-try-catch-test', result)
> > > > - self.assertContains(' # Subtest: string-stream-test', result)
> > > > - self.assertContains(' 1..3', result)
> > > > - self.assertContains(' ok 1 - string_stream_test_empty_on_creation', result)
> > > > - self.assertContains(' ok 2 - string_stream_test_not_empty_after_add', result)
> > > > - self.assertContains(' ok 3 - string_stream_test_get_string', result)
> > > > + self.assertContains('# Subtest: string-stream-test', result)
> > > > + self.assertContains('1..3', result)
> > > > + self.assertContains('ok 1 - string_stream_test_empty_on_creation', result)
> > > > + self.assertContains('ok 2 - string_stream_test_not_empty_after_add', result)
> > > > + self.assertContains('ok 3 - string_stream_test_get_string', result)
> > > > self.assertContains('ok 3 - string-stream-test', result)
> > > >
> > > > def test_parse_successful_test_log(self):
> > > > @@ -148,6 +148,13 @@ class KUnitParserTest(unittest.TestCase):
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > + def test_parse_successful_nested_tests_log(self):
> > > > + all_passed_log = test_data_path('test_is_test_passed-all_passed_nested.log')
> > > > + with open(all_passed_log) as file:
> > > > + result = kunit_parser.parse_run_tests(file.readlines())
> > > > + self.assertEqual(
> > > > + kunit_parser.TestStatus.SUCCESS,
> > > > + result.status)
> > > >
> > > > def test_parse_failed_test_log(self):
> > > > failed_log = test_data_path('test_is_test_passed-failure.log')
> > > > @@ -162,17 +169,31 @@ class KUnitParserTest(unittest.TestCase):
> > > > with open(empty_log) as file:
> > > > result = kunit_parser.parse_run_tests(
> > > > kunit_parser.extract_tap_lines(file.readlines()))
> > > > - self.assertEqual(0, len(result.suites))
> > > > + self.assertEqual(0, len(result.test.subtests))
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.FAILURE_TO_PARSE_TESTS,
> > > > result.status)
> > > >
> > > > + def test_missing_test_plan(self):
> > > > + missing_plan_log = test_data_path('test_is_test_passed-'
> > > > + 'missing_plan.log')
> > > > + with open(missing_plan_log) as file:
> > > > + result = kunit_parser.parse_run_tests(
> > > > + kunit_parser.extract_tap_lines(
> > > > + file.readlines()))
> > > > + self.assertEqual(2, result.test.counts.errors)
> > > > + self.assertEqual(
> > > > + kunit_parser.TestStatus.SUCCESS,
> > > > + result.status)
> > > > +
> > > > def test_no_tests(self):
> > > > - empty_log = test_data_path('test_is_test_passed-no_tests_run_with_header.log')
> > > > - with open(empty_log) as file:
> > > > + header_log = test_data_path('test_is_test_passed-'
> > > > + 'no_tests_run_with_header.log')
> > > > + with open(header_log) as file:
> > > > result = kunit_parser.parse_run_tests(
> > > > - kunit_parser.extract_tap_lines(file.readlines()))
> > > > - self.assertEqual(0, len(result.suites))
> > > > + kunit_parser.extract_tap_lines(
> > > > + file.readlines()))
> > > > + self.assertEqual(0, len(result.test.subtests))
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.NO_TESTS,
> > > > result.status)
> > > > @@ -182,15 +203,17 @@ class KUnitParserTest(unittest.TestCase):
> > > > print_mock = mock.patch('builtins.print').start()
> > > > with open(crash_log) as file:
> > > > result = kunit_parser.parse_run_tests(
> > > > - kunit_parser.extract_tap_lines(file.readlines()))
> > > > - print_mock.assert_any_call(StrContains('could not parse test results!'))
> > > > + kunit_parser.extract_tap_lines(
> > > > + file.readlines()))
> > > > + print_mock.assert_any_call(StrContains('invalid KTAP input!'))
> > > > print_mock.stop()
> > > > file.close()
> > > >
> > > > def test_crashed_test(self):
> > > > crashed_log = test_data_path('test_is_test_passed-crash.log')
> > > > with open(crashed_log) as file:
> > > > - result = kunit_parser.parse_run_tests(file.readlines())
> > > > + result = kunit_parser.parse_run_tests(
> > > > + file.readlines())
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.TEST_CRASHED,
> > > > result.status)
> > > > @@ -216,6 +239,23 @@ class KUnitParserTest(unittest.TestCase):
> > > > result.status)
> > > > file.close()
> > > >
> > > > + def test_ignores_hyphen(self):
> > > > + hyphen_log = test_data_path('test_strip_hyphen.log')
> > > > + file = open(hyphen_log)
> > > > + result = kunit_parser.parse_run_tests(file.readlines())
> > > > +
> > > > + # A skipped test does not fail the whole suite.
> > > > + self.assertEqual(
> > > > + kunit_parser.TestStatus.SUCCESS,
> > > > + result.status)
> > > > + self.assertEqual(
> > > > + "sysctl_test",
> > > > + result.test.subtests[0].name)
> > > > + self.assertEqual(
> > > > + "example",
> > > > + result.test.subtests[1].name)
> > > > + file.close()
> > > > +
> > > >
> > > > def test_ignores_prefix_printk_time(self):
> > > > prefix_log = test_data_path('test_config_printk_time.log')
> > > > @@ -224,7 +264,7 @@ class KUnitParserTest(unittest.TestCase):
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > - self.assertEqual('kunit-resource-test', result.suites[0].name)
> > > > + self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
> > > >
> > > > def test_ignores_multiple_prefixes(self):
> > > > prefix_log = test_data_path('test_multiple_prefixes.log')
> > > > @@ -233,7 +273,7 @@ class KUnitParserTest(unittest.TestCase):
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > - self.assertEqual('kunit-resource-test', result.suites[0].name)
> > > > + self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
> > > >
> > > > def test_prefix_mixed_kernel_output(self):
> > > > mixed_prefix_log = test_data_path('test_interrupted_tap_output.log')
> > > > @@ -242,7 +282,7 @@ class KUnitParserTest(unittest.TestCase):
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > - self.assertEqual('kunit-resource-test', result.suites[0].name)
> > > > + self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
> > > >
> > > > def test_prefix_poundsign(self):
> > > > pound_log = test_data_path('test_pound_sign.log')
> > > > @@ -251,16 +291,16 @@ class KUnitParserTest(unittest.TestCase):
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > - self.assertEqual('kunit-resource-test', result.suites[0].name)
> > > > + self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
> > > >
> > > > def test_kernel_panic_end(self):
> > > > panic_log = test_data_path('test_kernel_panic_interrupt.log')
> > > > with open(panic_log) as file:
> > > > result = kunit_parser.parse_run_tests(file.readlines())
> > > > self.assertEqual(
> > > > - kunit_parser.TestStatus.TEST_CRASHED,
> > > > + kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > - self.assertEqual('kunit-resource-test', result.suites[0].name)
> > > > + self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
> > > >
> > > > def test_pound_no_prefix(self):
> > > > pound_log = test_data_path('test_pound_no_prefix.log')
> > > > @@ -269,7 +309,7 @@ class KUnitParserTest(unittest.TestCase):
> > > > self.assertEqual(
> > > > kunit_parser.TestStatus.SUCCESS,
> > > > result.status)
> > > > - self.assertEqual('kunit-resource-test', result.suites[0].name)
> > > > + self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
> > > >
> > > > class LinuxSourceTreeTest(unittest.TestCase):
> > > >
> > > > @@ -291,6 +331,14 @@ class LinuxSourceTreeTest(unittest.TestCase):
> > > > pass
> > > > tree = kunit_kernel.LinuxSourceTree('', kunitconfig_path=dir)
> > > >
> > > > + def test_kselftest_nested(self):
> > > > + kselftest_log = test_data_path('test_is_test_passed-kselftest.log')
> > > > + with open(kselftest_log) as file:
> > > > + result = kunit_parser.parse_run_tests(file.readlines())
> > > > + self.assertEqual(
> > > > + kunit_parser.TestStatus.SUCCESS,
> > > > + result.status)
> > > > +
> > > > # TODO: add more test cases.
> > > >
> > > >
> > > > @@ -322,6 +370,12 @@ class KUnitJsonTest(unittest.TestCase):
> > > > result = self._json_for('test_is_test_passed-no_tests_run_with_header.log')
> > > > self.assertEqual(0, len(result['sub_groups']))
> > > >
> > > > + def test_nested_json(self):
> > > > + result = self._json_for('test_is_test_passed-all_passed_nested.log')
> > > > + self.assertEqual(
> > > > + {'name': 'example_simple_test', 'status': 'PASS'},
> > > > + result["sub_groups"][0]["sub_groups"][0]["test_cases"][0])
> > > > +
> > > > class StrContains(str):
> > > > def __eq__(self, other):
> > > > return self in other
> > > > @@ -380,7 +434,7 @@ class KUnitMainTest(unittest.TestCase):
> > > > self.assertEqual(e.exception.code, 1)
> > > > self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1)
> > > > self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)
> > > > - self.print_mock.assert_any_call(StrContains(' 0 tests run'))
> > > > + self.print_mock.assert_any_call(StrContains('invalid KTAP input!'))
> > > >
> > > > def test_exec_raw_output(self):
> > > > self.linux_source_mock.run_kernel = mock.Mock(return_value=[])
> > > > @@ -388,7 +442,7 @@ class KUnitMainTest(unittest.TestCase):
> > > > self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)
> > > > for call in self.print_mock.call_args_list:
> > > > self.assertNotEqual(call, mock.call(StrContains('Testing complete.')))
> > > > - self.assertNotEqual(call, mock.call(StrContains(' 0 tests run')))
> > > > + self.assertNotEqual(call, mock.call(StrContains(' 0 tests run!')))
> > > >
> > > > def test_run_raw_output(self):
> > > > self.linux_source_mock.run_kernel = mock.Mock(return_value=[])
> > > > @@ -397,7 +451,7 @@ class KUnitMainTest(unittest.TestCase):
> > > > self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)
> > > > for call in self.print_mock.call_args_list:
> > > > self.assertNotEqual(call, mock.call(StrContains('Testing complete.')))
> > > > - self.assertNotEqual(call, mock.call(StrContains(' 0 tests run')))
> > > > + self.assertNotEqual(call, mock.call(StrContains(' 0 tests run!')))
> > > >
> > > > def test_run_raw_output_kunit(self):
> > > > self.linux_source_mock.run_kernel = mock.Mock(return_value=[])
> > > > diff --git a/tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
> > b/tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
> > > > new file mode 100644
> > > > index 000000000000..9d5b04fe43a6
> > > > --- /dev/null
> > > > +++ b/tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
> > > > @@ -0,0 +1,34 @@
> > > > +TAP version 14
> > > > +1..2
> > > > + # Subtest: sysctl_test
> > > > + 1..4
> > > > + # sysctl_test_dointvec_null_tbl_data: sysctl_test_dointvec_null_tbl_data passed
> > > > + ok 1 - sysctl_test_dointvec_null_tbl_data
> > > > + # Subtest: example
> > > > + 1..2
> > > > + init_suite
> > > > + # example_simple_test: initializing
> > > > + # example_simple_test: example_simple_test passed
> > > > + ok 1 - example_simple_test
> > > > + # example_mock_test: initializing
> > > > + # example_mock_test: example_mock_test passed
> > > > + ok 2 - example_mock_test
> > > > + kunit example: all tests passed
> > > > + ok 2 - example
> > > > + # sysctl_test_dointvec_table_len_is_zero: sysctl_test_dointvec_table_len_is_zero passed
> > > > + ok 3 - sysctl_test_dointvec_table_len_is_zero
> > > > + # sysctl_test_dointvec_table_read_but_position_set: sysctl_test_dointvec_table_read_but_position_set passed
> > > > + ok 4 - sysctl_test_dointvec_table_read_but_position_set
> > > > +kunit sysctl_test: all tests passed
> > > > +ok 1 - sysctl_test
> > > > + # Subtest: example
> > > > + 1..2
> > > > +init_suite
> > > > + # example_simple_test: initializing
> > > > + # example_simple_test: example_simple_test passed
> > > > + ok 1 - example_simple_test
> > > > + # example_mock_test: initializing
> > > > + # example_mock_test: example_mock_test passed
> > > > + ok 2 - example_mock_test
> > > > +kunit example: all tests passed
> > > > +ok 2 - example
> > > > diff --git a/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log b/tools/testing/kunit/test_data/test_is_test_passed-
> > kselftest.log
> > > > new file mode 100644
> > > > index 000000000000..65d3f27feaf2
> > > > --- /dev/null
> > > > +++ b/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log
> > > > @@ -0,0 +1,14 @@
> > > > +TAP version 13
> > > > +1..2
> > > > +# selftests: membarrier: membarrier_test_single_thread
> > > > +# TAP version 13
> > > > +# 1..2
> > > > +# ok 1 sys_membarrier available
> > > > +# ok 2 sys membarrier invalid command test: command = -1, flags = 0, errno = 22. Failed as expected
> > > > +ok 1 selftests: membarrier: membarrier_test_single_thread
> > > > +# selftests: membarrier: membarrier_test_multi_thread
> > > > +# TAP version 13
> > > > +# 1..2
> > > > +# ok 1 sys_membarrier available
> > > > +# ok 2 sys membarrier invalid command test: command = -1, flags = 0, errno = 22. Failed as expected
> > > > +ok 2 selftests: membarrier: membarrier_test_multi_thread
> > > > diff --git a/tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log b/tools/testing/kunit/test_data/test_is_test_passed-
> > missing_plan.log
> > > > new file mode 100644
> > > > index 000000000000..5cd17b7f818a
> > > > --- /dev/null
> > > > +++ b/tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log
> > > > @@ -0,0 +1,31 @@
> > > > +KTAP version 1
> > > > + # Subtest: sysctl_test
> > > > + # sysctl_test_dointvec_null_tbl_data: sysctl_test_dointvec_null_tbl_data passed
> > > > + ok 1 - sysctl_test_dointvec_null_tbl_data
> > > > + # sysctl_test_dointvec_table_maxlen_unset: sysctl_test_dointvec_table_maxlen_unset passed
> > > > + ok 2 - sysctl_test_dointvec_table_maxlen_unset
> > > > + # sysctl_test_dointvec_table_len_is_zero: sysctl_test_dointvec_table_len_is_zero passed
> > > > + ok 3 - sysctl_test_dointvec_table_len_is_zero
> > > > + # sysctl_test_dointvec_table_read_but_position_set: sysctl_test_dointvec_table_read_but_position_set passed
> > > > + ok 4 - sysctl_test_dointvec_table_read_but_position_set
> > > > + # sysctl_test_dointvec_happy_single_positive: sysctl_test_dointvec_happy_single_positive passed
> > > > + ok 5 - sysctl_test_dointvec_happy_single_positive
> > > > + # sysctl_test_dointvec_happy_single_negative: sysctl_test_dointvec_happy_single_negative passed
> > > > + ok 6 - sysctl_test_dointvec_happy_single_negative
> > > > + # sysctl_test_dointvec_single_less_int_min: sysctl_test_dointvec_single_less_int_min passed
> > > > + ok 7 - sysctl_test_dointvec_single_less_int_min
> > > > + # sysctl_test_dointvec_single_greater_int_max: sysctl_test_dointvec_single_greater_int_max passed
> > > > + ok 8 - sysctl_test_dointvec_single_greater_int_max
> > > > +kunit sysctl_test: all tests passed
> > > > +ok 1 - sysctl_test
> > > > + # Subtest: example
> > > > + 1..2
> > > > +init_suite
> > > > + # example_simple_test: initializing
> > > > + # example_simple_test: example_simple_test passed
> > > > + ok 1 - example_simple_test
> > > > + # example_mock_test: initializing
> > > > + # example_mock_test: example_mock_test passed
> > > > + ok 2 - example_mock_test
> > > > +kunit example: all tests passed
> > > > +ok 2 - example
> > > > diff --git a/tools/testing/kunit/test_data/test_strip_hyphen.log b/tools/testing/kunit/test_data/test_strip_hyphen.log
> > > > new file mode 100644
> > > > index 000000000000..92ac7c24b374
> > > > --- /dev/null
> > > > +++ b/tools/testing/kunit/test_data/test_strip_hyphen.log
> > > > @@ -0,0 +1,16 @@
> > > > +KTAP version 1
> > > > +1..2
> > > > + # Subtest: sysctl_test
> > > > + 1..1
> > > > + # sysctl_test_dointvec_null_tbl_data: sysctl_test_dointvec_null_tbl_data passed
> > > > + ok 1 - sysctl_test_dointvec_null_tbl_data
> > > > +kunit sysctl_test: all tests passed
> > > > +ok 1 - sysctl_test
> > > > + # Subtest: example
> > > > + 1..1
> > > > +init_suite
> > > > + # example_simple_test: initializing
> > > > + # example_simple_test: example_simple_test passed
> > > > + ok 1 example_simple_test
> > > > +kunit example: all tests passed
> > > > +ok 2 example
> > > > --
> > > > 2.33.0.259.gc128427fd7-goog
> > > >
> > > > --
> > > > You received this message because you are subscribed to the Google Groups "KUnit Development" group.
> > > > To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe(a)googlegroups.com.
> > > > To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20210826195505.3066755-1-
> > rmoar%40google.com.
2 years, 11 months
- 1
- 0
[PATCH v2] kunit: tool: improve compatibility of kunit_parser with KTAP specification
by Rae Moar
Update to kunit_parser to improve compatibility with KTAP
specification including arbitrarily nested tests. Patch accomplishes
three major changes:
- Use a general Test object to represent all tests rather than TestCase
and TestSuite objects. This allows for easier implementation of arbitrary
levels of nested tests and promotes the idea that both test suites and test
cases are tests.
- Print errors incrementally rather than all at once after the
parsing finishes to maximize information given to the user in the
case of the parser given invalid input and to increase the helpfulness
of the timestamps given during printing. Note that kunit.py parse does
not print incrementally yet. However, this fix brings us closer to
this feature.
- Increase compatibility for different formats of input. Arbitrary levels
of nested tests supported. Also, test cases and test suites are now
supported to be present on the same level of testing.
This patch now implements the KTAP specification as described here:
https://lore.kernel.org/linux-kselftest/CA+GJov6tdjvY9x12JsJT14qn6c7NViJxqa….
This patch adjusts the kunit_tool_test.py file to check for
the correct outputs from the new parser and adds a new test to check
the parsing for a KTAP result log with correct format for multiple nested
subtests (test_is_test_passed-all_passed_nested.log).
This patch also alters the kunit_json.py file to allow for arbitrarily
nested tests.
Signed-off-by: Rae Moar <rmoar(a)google.com>
Reviewed-by: Brendan Higgins <brendanhiggins(a)google.com>
---
Change log from v1:
https://lore.kernel.org/linux-kselftest/20210820200032.2178134-1-rmoar@goog…
- Rebase onto kselftest/kunit branch
- Add tests to kunit_tool_test.py to check parser is correctly stripping
hyphen, producing correct json objects with nested tests, correctly
passing kselftest TAP output, and correctly deals with missing test plan.
- Fix bug to correctly match test name in instance of a missing test plan.
- Fix bug in kunit_tool_test.py pointed out by Daniel where it was not
correctly checking for a proper match to the '0 tests run!' error
message. Reverts changes back to original.
- A few minor changes to commit message using Daniel's comments.
- Change docstrings using Daniel's comments to reduce:
- Shortens some docstrings to be one-line or just description if it is
self explanatory.
- Remove explicit respecification of types of parameters and returns
because this is already specified in the function annoations. However,
some descriptions of the parameters and returns remain and some contain
the type for context. Additionally, the types of public attributes of
classes remain.
- Remove any documentation of 'Return: None'
- Remove docstrings of helper methods within other methods.
---
tools/testing/kunit/kunit_json.py | 55 +-
tools/testing/kunit/kunit_parser.py | 1056 ++++++++++++-----
tools/testing/kunit/kunit_tool_test.py | 134 ++-
.../test_is_test_passed-all_passed_nested.log | 34 +
.../test_is_test_passed-kselftest.log | 14 +
.../test_is_test_passed-missing_plan.log | 31 +
.../kunit/test_data/test_strip_hyphen.log | 16 +
7 files changed, 951 insertions(+), 389 deletions(-)
create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-kselftest.log
create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log
create mode 100644 tools/testing/kunit/test_data/test_strip_hyphen.log
diff --git a/tools/testing/kunit/kunit_json.py b/tools/testing/kunit/kunit_json.py
index f5cca5c38cac..e7317b4fad9d 100644
--- a/tools/testing/kunit/kunit_json.py
+++ b/tools/testing/kunit/kunit_json.py
@@ -11,47 +11,46 @@ import os
import kunit_parser
-from kunit_parser import TestStatus
-
-def get_json_result(test_result, def_config, build_dir, json_path) -> str:
- sub_groups = []
-
- # Each test suite is mapped to a KernelCI sub_group
- for test_suite in test_result.suites:
- sub_group = {
- "name": test_suite.name,
- "arch": "UM",
- "defconfig": def_config,
- "build_environment": build_dir,
- "test_cases": [],
- "lab_name": None,
- "kernel": None,
- "job": None,
- "git_branch": "kselftest",
- }
- test_cases = []
- # TODO: Add attachments attribute in test_case with detailed
- # failure message, see https://api.kernelci.org/schema-test-case.html#get
- for case in test_suite.cases:
- test_case = {"name": case.name, "status": "FAIL"}
- if case.status == TestStatus.SUCCESS:
+from kunit_parser import Test, TestResult, TestStatus
+from typing import Any, Dict
+
+JsonObj = Dict[str, Any]
+
+def _get_group_json(test: Test, def_config: str, build_dir: str) -> JsonObj:
+ sub_groups = [] # List[JsonObj]
+ test_cases = [] # List[JsonObj]
+
+ for subtest in test.subtests:
+ if len(subtest.subtests):
+ sub_group = _get_group_json(subtest, def_config,
+ build_dir)
+ sub_groups.append(sub_group)
+ else:
+ test_case = {"name": subtest.name, "status": "FAIL"}
+ if subtest.status == TestStatus.SUCCESS:
test_case["status"] = "PASS"
- elif case.status == TestStatus.TEST_CRASHED:
+ elif subtest.status == TestStatus.TEST_CRASHED:
test_case["status"] = "ERROR"
test_cases.append(test_case)
- sub_group["test_cases"] = test_cases
- sub_groups.append(sub_group)
+
test_group = {
- "name": "KUnit Test Group",
+ "name": test.name,
"arch": "UM",
"defconfig": def_config,
"build_environment": build_dir,
"sub_groups": sub_groups,
+ "test_cases": test_cases,
"lab_name": None,
"kernel": None,
"job": None,
"git_branch": "kselftest",
}
+ return test_group
+
+def get_json_result(test_result: TestResult, def_config: str, build_dir: str,
+ json_path: str) -> str:
+ test_group = _get_group_json(test_result.test, def_config, build_dir)
+ test_group["name"] = "KUnit Test Group"
json_obj = json.dumps(test_group, indent=4)
if json_path != 'stdout':
with open(json_path, 'w') as result_path:
diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py
index 6310a641b151..4b6086159c7f 100644
--- a/tools/testing/kunit/kunit_parser.py
+++ b/tools/testing/kunit/kunit_parser.py
@@ -1,11 +1,15 @@
# SPDX-License-Identifier: GPL-2.0
#
-# Parses test results from a kernel dmesg log.
+# Parses KTAP test results from a kernel dmesg log and incrementally prints
+# results with reader-friendly format. Stores and returns test results in a
+# Test object.
#
# Copyright (C) 2019, Google LLC.
# Author: Felix Guo <felixguoxiuping(a)gmail.com>
# Author: Brendan Higgins <brendanhiggins(a)google.com>
+# Author: Rae Moar <rmoar(a)google.com>
+from __future__ import annotations
import re
from collections import namedtuple
@@ -14,33 +18,55 @@ from enum import Enum, auto
from functools import reduce
from typing import Iterable, Iterator, List, Optional, Tuple
-TestResult = namedtuple('TestResult', ['status','suites','log'])
-
-class TestSuite(object):
- def __init__(self) -> None:
- self.status = TestStatus.SUCCESS
- self.name = ''
- self.cases = [] # type: List[TestCase]
-
- def __str__(self) -> str:
- return 'TestSuite(' + str(self.status) + ',' + self.name + ',' + str(self.cases) + ')'
-
- def __repr__(self) -> str:
- return str(self)
-
-class TestCase(object):
+TestResult = namedtuple('TestResult', ['status','test','log'])
+
+class Test(object):
+ """
+ A class to represent a test parsed from KTAP results. All KTAP
+ results within a test log are stored in a main Test object as
+ subtests.
+
+ Attributes:
+ status : TestStatus - status of the test
+ name : str - name of the test
+ expected_count : int - expected number of subtests (0 if single
+ test case and None if unknown expected number of subtests)
+ subtests : List[Test] - list of subtests
+ log : List[str] - log of KTAP lines that correspond to the test
+ counts : TestCounts - counts of the test statuses and errors of
+ subtests or of the test itself if the test is a single
+ test case.
+ """
def __init__(self) -> None:
+ """Constructs the default attributes of a Test class object.
+ """
self.status = TestStatus.SUCCESS
self.name = ''
+ self.expected_count = 0 # type: Optional[int]
+ self.subtests = [] # type: List[Test]
self.log = [] # type: List[str]
+ self.counts = TestCounts()
def __str__(self) -> str:
- return 'TestCase(' + str(self.status) + ',' + self.name + ',' + str(self.log) + ')'
+ """Returns string representation of a Test class object."""
+ return ('Test(' + str(self.status) + ', ' + self.name +
+ ', ' + str(self.expected_count) + ', ' +
+ str(self.subtests) + ', ' + str(self.log) + ', ' +
+ str(self.counts) + ')')
def __repr__(self) -> str:
+ """Returns string representation of a Test class object."""
return str(self)
+ def add_error(self, error_message: str) -> None:
+ """Adds error to test object by incrementing the error count
+ and printing the error message.
+ """
+ self.counts.errors += 1
+ print_error('Test ' + self.name + ': ' + error_message)
+
class TestStatus(Enum):
+ """An enumeration class to represent the status of a test."""
SUCCESS = auto()
FAILURE = auto()
SKIPPED = auto()
@@ -48,381 +74,769 @@ class TestStatus(Enum):
NO_TESTS = auto()
FAILURE_TO_PARSE_TESTS = auto()
+class TestCounts:
+ """
+ A class to represent the counts of statuses and test errors of
+ subtests or of the test itself if the test is a single test case with
+ no subtests. Note that the sum of the counts of passed, failed,
+ crashed, and skipped should sum to the total number of subtests for
+ the test.
+
+ Attributes:
+ passed : int - the number of tests that have passed
+ failed : int - the number of tests that have failed
+ crashed : int - the number of tests that have crashed
+ skipped : int - the number of tests that have skipped
+ errors : int - the number of errors in the test and subtests
+ """
+ def __init__(self):
+ """Contructs the default attributes of a TestCounts class
+ object. Sets the counts of all test statuses and test
+ errors to be 0.
+ """
+ self.passed = 0
+ self.failed = 0
+ self.crashed = 0
+ self.skipped = 0
+ self.errors = 0
+
+ def __str__(self) -> str:
+ """Returns the string representation of a TestCounts object.
+ """
+ return ('Passed: ' + str(self.passed) +
+ ', Failed: ' + str(self.failed) +
+ ', Crashed: ' + str(self.crashed) +
+ ', Skipped: ' + str(self.skipped) +
+ ', Errors: ' + str(self.errors))
+
+ def total(self) -> int:
+ """Returns total number of subtests or 1 if the test object
+ has no subtests to represent the test itself. This number is
+ calculated by the sum of the passed, failed, crashed, and
+ skipped subtests.
+ """
+ return (self.passed + self.failed + self.crashed +
+ self.skipped)
+
+ def add_subtest_counts(self, counts: TestCounts) -> None:
+ """
+ Adds the counts of another TestCounts object to the current
+ TestCounts object. Used to add the counts of a subtest to the
+ parent test.
+
+ Parameters:
+ counts - a different TestCounts object whose counts
+ will be added to the counts of the TestCounts object
+ """
+ self.passed += counts.passed
+ self.failed += counts.failed
+ self.crashed += counts.crashed
+ self.skipped += counts.skipped
+ self.errors += counts.errors
+
+ def get_status(self) -> TestStatus:
+ """Returns the expected status of a Test using test counts."""
+ if self.crashed:
+ # If one of the subtests crash, the expected status
+ # of the Test is crashed.
+ return TestStatus.TEST_CRASHED
+ elif self.failed:
+ # Otherwise if one of the subtests fail, the
+ # expected status of the Test is failed.
+ return TestStatus.FAILURE
+ elif self.passed:
+ # Otherwise if one of the subtests pass, the
+ # expected status of the Test is passed.
+ return TestStatus.SUCCESS
+ else:
+ # Finally, if none of the subtests have failed,
+ # crashed, or passed, the expected status of the
+ # Test is skipped.
+ return TestStatus.SKIPPED
+
+ def add_status(self, status: TestStatus) -> None:
+ """
+ Given inputted status, increments corresponding attribute of
+ TestCounts object.
+
+ Parameters:
+ status - status to be added to the TestCounts object
+ """
+ if status == TestStatus.SUCCESS or \
+ status == TestStatus.NO_TESTS:
+ # if status is NO_TESTS the most appropriate
+ # attribute to increment is passed because
+ # the test did not fail, crash or get skipped.
+ self.passed += 1
+ elif status == TestStatus.FAILURE:
+ self.failed += 1
+ elif status == TestStatus.SKIPPED:
+ self.skipped += 1
+ else:
+ self.crashed += 1
+
class LineStream:
- """Provides a peek()/pop() interface over an iterator of (line#, text)."""
+ """
+ A class to represent the lines of kernel output.
+ Provides a peek()/pop() interface over an iterator of
+ (line#, text).
+ """
_lines: Iterator[Tuple[int, str]]
_next: Tuple[int, str]
_done: bool
def __init__(self, lines: Iterator[Tuple[int, str]]):
+ """Set defaults for LineStream object and sets _lines
+ attribute to lines parameter.
+ """
self._lines = lines
self._done = False
self._next = (0, '')
self._get_next()
def _get_next(self) -> None:
+ """Advances the LineSteam to the next line or sets the _done
+ attribute if the LineStream has reached the end of the lines.
+ """
try:
self._next = next(self._lines)
except StopIteration:
self._done = True
def peek(self) -> str:
+ """Returns the next line in the LineStream without advancing
+ the LineStream.
+ """
return self._next[1]
def pop(self) -> str:
+ """Returns the next line in the LineStream and advances the
+ LineStream to the next line.
+ """
n = self._next
self._get_next()
return n[1]
def __bool__(self) -> bool:
+ """Returns whether the LineStream has reached the end of the
+ lines.
+ """
return not self._done
# Only used by kunit_tool_test.py.
def __iter__(self) -> Iterator[str]:
+ """Empties all lines stored in LineStream object into
+ Iterator object and returns the Iterator object.
+ """
while bool(self):
yield self.pop()
def line_number(self) -> int:
+ """Returns the line number of the next line in the
+ LineStream.
+ """
return self._next[0]
-kunit_start_re = re.compile(r'TAP version [0-9]+$')
-kunit_end_re = re.compile('(List of all partitions:|'
- 'Kernel panic - not syncing: VFS:|reboot: System halted)')
+# Parsing helper methods:
+
+KTAP_START = re.compile(r'KTAP version ([0-9]+)$')
+TAP_START = re.compile(r'TAP version ([0-9]+)$')
+KTAP_END = re.compile('(List of all partitions:|'
+ 'Kernel panic - not syncing: VFS:|reboot: System halted)')
def extract_tap_lines(kernel_output: Iterable[str]) -> LineStream:
- def isolate_kunit_output(kernel_output: Iterable[str]) -> Iterator[Tuple[int, str]]:
+ """Extracts KTAP lines from inputted kernel output in LineStream
+ object."""
+ def isolate_ktap_output(kernel_output: Iterable[str]) \
+ -> Iterator[Tuple[int, str]]:
line_num = 0
started = False
for line in kernel_output:
line_num += 1
- line = line.rstrip() # line always has a trailing \n
- if kunit_start_re.search(line):
+ line = line.rstrip() # remove trailing \n
+ if not started and KTAP_START.search(line):
+ # start extracting KTAP lines and set prefix
+ # to number of characters before version line
+ prefix_len = len(
+ line.split('KTAP version')[0])
+ started = True
+ yield line_num, line[prefix_len:]
+ elif not started and TAP_START.search(line):
+ # start extracting KTAP lines and set prefix
+ # to number of characters before version line
prefix_len = len(line.split('TAP version')[0])
started = True
yield line_num, line[prefix_len:]
- elif kunit_end_re.search(line):
+ elif started and KTAP_END.search(line):
+ # stop extracting KTAP lines
break
elif started:
- yield line_num, line[prefix_len:]
- return LineStream(lines=isolate_kunit_output(kernel_output))
-
-DIVIDER = '=' * 60
-
-RESET = '\033[0;0m'
-
-def red(text) -> str:
- return '\033[1;31m' + text + RESET
-
-def yellow(text) -> str:
- return '\033[1;33m' + text + RESET
-
-def green(text) -> str:
- return '\033[1;32m' + text + RESET
-
-def print_with_timestamp(message) -> None:
- print('[%s] %s' % (datetime.now().strftime('%H:%M:%S'), message))
-
-def format_suite_divider(message) -> str:
- return '======== ' + message + ' ========'
-
-def print_suite_divider(message) -> None:
- print_with_timestamp(DIVIDER)
- print_with_timestamp(format_suite_divider(message))
-
-def print_log(log) -> None:
- for m in log:
- print_with_timestamp(m)
-
-TAP_ENTRIES = re.compile(r'^(TAP|[\s]*ok|[\s]*not ok|[\s]*[0-9]+\.\.[0-9]+|[\s]*# (Subtest:|.*: kunit test case crashed!)).*$')
-
-def consume_non_diagnostic(lines: LineStream) -> None:
- while lines and not TAP_ENTRIES.match(lines.peek()):
- lines.pop()
-
-def save_non_diagnostic(lines: LineStream, test_case: TestCase) -> None:
- while lines and not TAP_ENTRIES.match(lines.peek()):
- test_case.log.append(lines.peek())
- lines.pop()
-
-OkNotOkResult = namedtuple('OkNotOkResult', ['is_ok','description', 'text'])
-
-OK_NOT_OK_SKIP = re.compile(r'^[\s]*(ok|not ok) [0-9]+ - (.*) # SKIP(.*)$')
-
-OK_NOT_OK_SUBTEST = re.compile(r'^[\s]+(ok|not ok) [0-9]+ - (.*)$')
-
-OK_NOT_OK_MODULE = re.compile(r'^(ok|not ok) ([0-9]+) - (.*)$')
-
-def parse_ok_not_ok_test_case(lines: LineStream, test_case: TestCase) -> bool:
- save_non_diagnostic(lines, test_case)
- if not lines:
- test_case.status = TestStatus.TEST_CRASHED
- return True
- line = lines.peek()
- match = OK_NOT_OK_SUBTEST.match(line)
- while not match and lines:
- line = lines.pop()
- match = OK_NOT_OK_SUBTEST.match(line)
- if match:
- test_case.log.append(lines.pop())
- test_case.name = match.group(2)
- skip_match = OK_NOT_OK_SKIP.match(line)
- if skip_match:
- test_case.status = TestStatus.SKIPPED
- return True
- if test_case.status == TestStatus.TEST_CRASHED:
- return True
- if match.group(1) == 'ok':
- test_case.status = TestStatus.SUCCESS
- else:
- test_case.status = TestStatus.FAILURE
- return True
+ # remove prefix and any indention and yield
+ # line with line number
+ line = line[prefix_len:].lstrip()
+ yield line_num, line
+ return LineStream(lines=isolate_ktap_output(kernel_output))
+
+def raw_output(kernel_output: Iterable[str]) -> None:
+ """Prints all lines of kernel output."""
+ for line in kernel_output:
+ print(line.rstrip())
+
+KTAP_VERSIONS = [1]
+TAP_VERSIONS = [13, 14]
+
+def check_version(version_num: int, accepted_versions: List[int],
+ version_type: str, test: Test) -> None:
+ """
+ Adds error to test object if version number is too high or too
+ low.
+
+ Parameters:
+ version_num - The inputted version number from the parsed KTAP or TAP
+ header line
+ accepted_version - List of accepted KTAP or TAP versions
+ version_type - 'KTAP' or 'TAP' depending on the type of
+ version line.
+ test - Test object for current test being parsed
+ """
+ if version_num < min(accepted_versions):
+ test.add_error(version_type +
+ ' version lower than expected!')
+ elif version_num > max(accepted_versions):
+ test.add_error(
+ version_type + ' version higher than expected!')
+
+def parse_ktap_header(lines: LineStream, test: Test) -> bool:
+ """
+ If the next line in LineStream matches the format of KTAP or TAP
+ header line, the version number is checked, the line is popped,
+ and returns True. Otherwise the method returns False.
+
+ Accepted formats:
+ - 'KTAP version [version number]'
+ - 'TAP version [version number]'
+
+ Parameters:
+ lines - LineStream of KTAP output to parse
+ test - Test object for current test being parsed
+
+ Return:
+ Boolean that represents if the next line in the LineStream was parsed
+ as the KTAP or TAP header line
+ """
+ ktap_match = KTAP_START.match(lines.peek())
+ tap_match = TAP_START.match(lines.peek())
+ if ktap_match:
+ version_num = int(ktap_match.group(1))
+ check_version(version_num, KTAP_VERSIONS, 'KTAP', test)
+ elif tap_match:
+ version_num = int(tap_match.group(1))
+ check_version(version_num, TAP_VERSIONS, 'TAP', test)
else:
return False
-
-SUBTEST_DIAGNOSTIC = re.compile(r'^[\s]+# (.*)$')
-DIAGNOSTIC_CRASH_MESSAGE = re.compile(r'^[\s]+# .*?: kunit test case crashed!$')
-
-def parse_diagnostic(lines: LineStream, test_case: TestCase) -> bool:
- save_non_diagnostic(lines, test_case)
- if not lines:
+ test.log.append(lines.pop())
+ return True
+
+TEST_HEADER = re.compile(r'^# Subtest: (.*)$')
+
+def parse_test_header(lines: LineStream, test: Test) -> bool:
+ """
+ If the next line in LineStream matches the format of a test
+ header line, the name of test is set, the line is popped,
+ and returns True. Otherwise the method returns False.
+
+ Accepted format:
+ - '# Subtest: [test name]'
+
+ Parameters:
+ lines - LineStream of ktap output to parse
+ test - Test object for current test being parsed
+
+ Return:
+ Boolean that represents if the next line in the LineStream was parsed
+ as a test header
+ """
+ match = TEST_HEADER.match(lines.peek())
+ if not match:
return False
+ test.log.append(lines.pop())
+ test.name = match.group(1)
+ return True
+
+TEST_PLAN = re.compile(r'1\.\.([0-9]+)')
+
+def parse_test_plan(lines: LineStream, test: Test) -> bool:
+ """
+ If the next line in LineStream matches the format of a test
+ plan line, the expected number of subtests is set in test object, an
+ error is thrown if there are 0 tests, the line is popped,
+ and returns True. Otherwise the method adds an error that the test
+ plan is missing to the test object and returns False.
+
+ Accepted format:
+ - '1..[number of subtests]'
+
+ Parameters:
+ lines - LineStream of ktap output to parse
+ test - Test object for current test being parsed
+
+ Return:
+ Boolean that represents if the next line in the LineStream was parsed
+ as a test plan
+ """
+ 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))
+ test.expected_count = expected_count
+ if expected_count == 0:
+ test.status = TestStatus.NO_TESTS
+ test.add_error('0 tests run!')
+ return True
+
+TEST_RESULT = re.compile(r'^(ok|not ok) ([0-9]+) (- )?(.*)$')
+
+TEST_RESULT_SKIP = re.compile(r'^(ok|not ok) ([0-9]+) (- )?(.*) # SKIP(.*)$')
+
+def peek_test_name_match(lines: LineStream, test: Test) -> bool:
+ """
+ If the next line in LineStream matches the format of a test
+ result line and the name of the result line matches the name of the
+ current test, the method returns True. Otherwise it returns False.
+
+ Accepted format:
+ - '[ok|not ok] [test number] [-] [test name] [optional skip
+ directive]'
+
+ Parameters:
+ lines - LineStream of KTAP output to parse
+ test - Test object for current test being parsed
+
+ Return:
+ Boolean that represents if the next line in the LineStream matched a
+ test result line and the name matched the expected test name
+ """
line = lines.peek()
- match = SUBTEST_DIAGNOSTIC.match(line)
- if match:
- test_case.log.append(lines.pop())
- crash_match = DIAGNOSTIC_CRASH_MESSAGE.match(line)
- if crash_match:
- test_case.status = TestStatus.TEST_CRASHED
- return True
- else:
+ match = TEST_RESULT.match(line)
+ if not match:
return False
+ name = match.group(4)
+ return (name == test.name)
+
+def parse_test_result(lines: LineStream, test: Test,
+ expected_num: int) -> bool:
+ """
+ If the next line in LineStream matches the format of a test
+ result line, the status in the result line is added to the test
+ object, the test number is checked to match the expected test number
+ and if not an error is added to the test object, and returns True.
+ Otherwise it returns False.
+
+ Note that the skip diirective is the only
+ directive that causes a change in status and otherwise the directive
+ is included in the name of the test.
+
+ Accepted format:
+ - '[ok|not ok] [test number] [-] [test name] [optional skip
+ directive]'
+
+ Parameters:
+ lines - LineStream of KTAP output to parse
+ test - Test object for current test being parsed
+ expected_num - expected test number for current test
+
+ Return:
+ Boolean that represents if the next line in the LineStream was parsed
+ as a test result line.
+ """
+ line = lines.peek()
+ match = TEST_RESULT.match(line)
+ skip_match = TEST_RESULT_SKIP.match(line)
-def parse_test_case(lines: LineStream) -> Optional[TestCase]:
- test_case = TestCase()
- save_non_diagnostic(lines, test_case)
- while parse_diagnostic(lines, test_case):
- pass
- if parse_ok_not_ok_test_case(lines, test_case):
- return test_case
- else:
- return None
-
-SUBTEST_HEADER = re.compile(r'^[\s]+# Subtest: (.*)$')
+ # Check if line matches test result line format
+ if not match:
+ return False
+ test.log.append(lines.pop())
-def parse_subtest_header(lines: LineStream) -> Optional[str]:
- consume_non_diagnostic(lines)
- if not lines:
- return None
- match = SUBTEST_HEADER.match(lines.peek())
- if match:
- lines.pop()
- return match.group(1)
+ # Set name of test object
+ if skip_match:
+ test.name = skip_match.group(4)
else:
- return None
+ test.name = match.group(4)
-SUBTEST_PLAN = re.compile(r'[\s]+[0-9]+\.\.([0-9]+)')
+ # Check test num
+ num = int(match.group(2))
+ if num != expected_num:
+ test.add_error('Expected test number ' +
+ str(expected_num) + ' but found ' + str(num))
-def parse_subtest_plan(lines: LineStream) -> Optional[int]:
- consume_non_diagnostic(lines)
- match = SUBTEST_PLAN.match(lines.peek())
- if match:
- lines.pop()
- return int(match.group(1))
- else:
- return None
-
-def max_status(left: TestStatus, right: TestStatus) -> TestStatus:
- if left == right:
- return left
- elif left == TestStatus.TEST_CRASHED or right == TestStatus.TEST_CRASHED:
- return TestStatus.TEST_CRASHED
- elif left == TestStatus.FAILURE or right == TestStatus.FAILURE:
- return TestStatus.FAILURE
- elif left == TestStatus.SKIPPED:
- return right
- else:
- return left
-
-def parse_ok_not_ok_test_suite(lines: LineStream,
- test_suite: TestSuite,
- expected_suite_index: int) -> bool:
- consume_non_diagnostic(lines)
- if not lines:
- test_suite.status = TestStatus.TEST_CRASHED
- return False
- line = lines.peek()
- match = OK_NOT_OK_MODULE.match(line)
- if match:
- lines.pop()
- if match.group(1) == 'ok':
- test_suite.status = TestStatus.SUCCESS
- else:
- test_suite.status = TestStatus.FAILURE
- skip_match = OK_NOT_OK_SKIP.match(line)
- if skip_match:
- test_suite.status = TestStatus.SKIPPED
- suite_index = int(match.group(2))
- if suite_index != expected_suite_index:
- print_with_timestamp(
- red('[ERROR] ') + 'expected_suite_index ' +
- str(expected_suite_index) + ', but got ' +
- str(suite_index))
+ # Set status of test object
+ status = match.group(1)
+ if test.status == TestStatus.TEST_CRASHED:
return True
+ elif skip_match:
+ test.status = TestStatus.SKIPPED
+ elif status == 'ok':
+ test.status = TestStatus.SUCCESS
else:
- return False
-
-def bubble_up_errors(status_list: Iterable[TestStatus]) -> TestStatus:
- return reduce(max_status, status_list, TestStatus.SKIPPED)
+ test.status = TestStatus.FAILURE
+ return True
+
+def parse_diagnostic(lines: LineStream) -> List[str]:
+ """
+ If the next line in LineStream does not match the format of a test
+ case line or test header line, the line is checked if the test has
+ crashed and if so adds an error message, pops the line and adds it to
+ the log.
+
+ Line formats that are not parsed:
+ - '# Subtest: [test name]'
+ - '[ok|not ok] [test number] [-] [test name] [optional skip
+ directive]'
+
+ Parameters:
+ lines - LineStream of KTAP output to parse
+
+ Return:
+ Log of diagnostic lines
+ """
+ log = [] # type: List[str]
+ while lines and not TEST_RESULT.match(lines.peek()) and not \
+ TEST_HEADER.match(lines.peek()):
+ log.append(lines.pop())
+ return log
+
+DIAGNOSTIC_CRASH_MESSAGE = re.compile(r'^# .*?: kunit test case crashed!$')
+
+def parse_crash_in_log(test: Test) -> bool:
+ """
+ Iterate through the lines of the log to parse for crash message.
+ If crash message found, set status to crashed and return True.
+ Otherwise return False.
+
+ Parameters:
+ test - Test object for current test being parsed
+
+ Return:
+ Boolean that represents if crash message found in log
+ """
+ for line in test.log:
+ if DIAGNOSTIC_CRASH_MESSAGE.match(line):
+ test.status = TestStatus.TEST_CRASHED
+ return True
+ return False
-def bubble_up_test_case_errors(test_suite: TestSuite) -> TestStatus:
- max_test_case_status = bubble_up_errors(x.status for x in test_suite.cases)
- return max_status(max_test_case_status, test_suite.status)
+# Printing helper methods:
-def parse_test_suite(lines: LineStream, expected_suite_index: int) -> Optional[TestSuite]:
- if not lines:
- return None
- consume_non_diagnostic(lines)
- test_suite = TestSuite()
- test_suite.status = TestStatus.SUCCESS
- name = parse_subtest_header(lines)
- if not name:
- return None
- test_suite.name = name
- expected_test_case_num = parse_subtest_plan(lines)
- if expected_test_case_num is None:
- return None
- while expected_test_case_num > 0:
- test_case = parse_test_case(lines)
- if not test_case:
- break
- test_suite.cases.append(test_case)
- expected_test_case_num -= 1
- if parse_ok_not_ok_test_suite(lines, test_suite, expected_suite_index):
- test_suite.status = bubble_up_test_case_errors(test_suite)
- return test_suite
- elif not lines:
- print_with_timestamp(red('[ERROR] ') + 'ran out of lines before end token')
- return test_suite
- else:
- print(f'failed to parse end of suite "{name}", at line {lines.line_number()}: {lines.peek()}')
- return None
+DIVIDER = '=' * 60
-TAP_HEADER = re.compile(r'^TAP version 14$')
+RESET = '\033[0;0m'
-def parse_tap_header(lines: LineStream) -> bool:
- consume_non_diagnostic(lines)
- if TAP_HEADER.match(lines.peek()):
- lines.pop()
- return True
- else:
- return False
+def red(text: str) -> str:
+ """Returns inputted string with red color code."""
+ return '\033[1;31m' + text + RESET
-TEST_PLAN = re.compile(r'[0-9]+\.\.([0-9]+)')
+def yellow(text: str) -> str:
+ """Returns inputted string with yellow color code."""
+ return '\033[1;33m' + text + RESET
-def parse_test_plan(lines: LineStream) -> Optional[int]:
- consume_non_diagnostic(lines)
- match = TEST_PLAN.match(lines.peek())
- if match:
- lines.pop()
- return int(match.group(1))
- else:
- return None
-
-def bubble_up_suite_errors(test_suites: Iterable[TestSuite]) -> TestStatus:
- return bubble_up_errors(x.status for x in test_suites)
-
-def parse_test_result(lines: LineStream) -> TestResult:
- consume_non_diagnostic(lines)
- if not lines or not parse_tap_header(lines):
- return TestResult(TestStatus.FAILURE_TO_PARSE_TESTS, [], lines)
- expected_test_suite_num = parse_test_plan(lines)
- if expected_test_suite_num == 0:
- return TestResult(TestStatus.NO_TESTS, [], lines)
- elif expected_test_suite_num is None:
- return TestResult(TestStatus.FAILURE_TO_PARSE_TESTS, [], lines)
- test_suites = []
- for i in range(1, expected_test_suite_num + 1):
- test_suite = parse_test_suite(lines, i)
- if test_suite:
- test_suites.append(test_suite)
- else:
- print_with_timestamp(
- red('[ERROR] ') + ' expected ' +
- str(expected_test_suite_num) +
- ' test suites, but got ' + str(i - 2))
- break
- test_suite = parse_test_suite(lines, -1)
- if test_suite:
- print_with_timestamp(red('[ERROR] ') +
- 'got unexpected test suite: ' + test_suite.name)
- if test_suites:
- return TestResult(bubble_up_suite_errors(test_suites), test_suites, lines)
- else:
- return TestResult(TestStatus.NO_TESTS, [], lines)
+def green(text: str) -> str:
+ """Returns inputted string with green color code."""
+ return '\033[1;32m' + text + RESET
-class TestCounts:
- passed: int
- failed: int
- crashed: int
- skipped: int
+ANSI_LEN = len(red(''))
- def __init__(self):
- self.passed = 0
- self.failed = 0
- self.crashed = 0
- self.skipped = 0
+def print_with_timestamp(message: str) -> None:
+ """Prints message with timestamp at beginning."""
+ print('[%s] %s' % (datetime.now().strftime('%H:%M:%S'), message))
- def total(self) -> int:
- return self.passed + self.failed + self.crashed + self.skipped
-
-def print_and_count_results(test_result: TestResult) -> TestCounts:
- counts = TestCounts()
- for test_suite in test_result.suites:
- if test_suite.status == TestStatus.SUCCESS:
- print_suite_divider(green('[PASSED] ') + test_suite.name)
- elif test_suite.status == TestStatus.SKIPPED:
- print_suite_divider(yellow('[SKIPPED] ') + test_suite.name)
- elif test_suite.status == TestStatus.TEST_CRASHED:
- print_suite_divider(red('[CRASHED] ' + test_suite.name))
+def format_test_divider(message: str, len_message: int) -> str:
+ """
+ Returns string with message centered in fixed width divider.
+
+ Example:
+ '===================== message example ====================='
+
+ Parameters:
+ message - message to be centered in divider line
+ len_message - length of the message to be printed such that
+ any characters of the color codes are not counted
+
+ Return:
+ String containing message centered in fixed width divider
+ """
+ default_count = 3 # default number of dashes
+ len_1 = default_count
+ len_2 = default_count
+ difference = len(DIVIDER) - len_message - 2 # 2 spaces added
+ if difference > 0:
+ # calculate number of dashes for each side of the divider
+ len_1 = int(difference / 2)
+ len_2 = difference - len_1
+ return ('=' * len_1) + ' ' + message + ' ' + ('=' * len_2)
+
+def print_test_header(test: Test) -> None:
+ """
+ Prints test header with test name and optionally the expected number
+ of subtests.
+
+ Example:
+ '=================== example (2 subtests) ==================='
+
+ Parameters:
+ test - Test object representing current test being printed
+ """
+ message = test.name
+ if test.expected_count:
+ message += ' (' + str(test.expected_count) + ' subtests)'
+ print_with_timestamp(format_test_divider(message, len(message)))
+
+def print_log(log: Iterable[str]) -> None:
+ """
+ Prints all strings in saved log for test in yellow.
+
+ Parameters:
+ log - Iterable object with all strings saved in log for test
+ """
+ for m in log:
+ print_with_timestamp(yellow(m))
+ print_with_timestamp('')
+
+def format_test_result(test: Test) -> str:
+ """
+ Returns string with formatted test result with colored status and test
+ name.
+
+ Example:
+ '[PASSED] example'
+
+ Parameters:
+ test - Test object representing current test being printed
+
+ Return:
+ String containing formatted test result
+ """
+ if test.status == TestStatus.SUCCESS:
+ return (green('[PASSED] ') + test.name)
+ elif test.status == TestStatus.SKIPPED:
+ return (yellow('[SKIPPED] ') + test.name)
+ elif test.status == TestStatus.TEST_CRASHED:
+ print_log(test.log)
+ return (red('[CRASHED] ') + test.name)
+ else:
+ print_log(test.log)
+ return (red('[FAILED] ') + test.name)
+
+def print_test_result(test: Test) -> None:
+ """
+ Prints result line with status of test.
+
+ Example:
+ '[PASSED] example'
+
+ Parameters:
+ test - Test object representing current test being printed
+ """
+ print_with_timestamp(format_test_result(test))
+
+def print_test_footer(test: Test) -> None:
+ """
+ Prints test footer with status of test.
+
+ Example:
+ '===================== [PASSED] example ====================='
+
+ Parameters:
+ test - Test object representing current test being printed
+ """
+ message = format_test_result(test)
+ print_with_timestamp(format_test_divider(message,
+ len(message) - ANSI_LEN))
+
+def print_summary_line(test: Test) -> None:
+ """
+ Prints summary line of test object. Color of line is dependent on
+ status of test. Color is green if test passes, yellow if test is
+ skipped, and red if the test fails or crashes. Summary line contains
+ counts of the statuses of the tests subtests or the test itself if it
+ has no subtests.
+
+ Example:
+ "Testing complete. Passed: 2, Failed: 0, Crashed: 0, Skipped: 0,
+ Errors: 0"
+
+ test - Test object representing current test being printed
+ """
+ if test.status == TestStatus.SUCCESS or \
+ test.status == TestStatus.NO_TESTS:
+ color = green
+ elif test.status == TestStatus.SKIPPED:
+ color = yellow
+ else:
+ color = red
+ counts = test.counts
+ print_with_timestamp(color('Testing complete. ' + str(counts)))
+
+def print_error(error_message: str) -> None:
+ """
+ Prints error message with error format.
+
+ Example:
+ "[ERROR] Test example: missing test plan!"
+
+ Parameters:
+ error_message - message describing error
+ """
+ print_with_timestamp(red('[ERROR] ') + error_message)
+
+# Other methods:
+
+def bubble_up_test_results(test: Test) -> None:
+ """
+ If the test has subtests, add the test counts of the subtests to the
+ test and check if any of the tests crashed and if so set the test
+ status to crashed. Otherwise if the test has no subtests add the
+ status of the test to the test counts.
+
+ Parameters:
+ test - Test object for current test being parsed
+ """
+ parse_crash_in_log(test)
+ subtests = test.subtests
+ counts = test.counts
+ status = test.status
+ for t in subtests:
+ counts.add_subtest_counts(t.counts)
+ if counts.total() == 0:
+ counts.add_status(status)
+ elif test.counts.get_status() == TestStatus.TEST_CRASHED:
+ test.status = TestStatus.TEST_CRASHED
+
+def parse_test(lines: LineStream, expected_num: int, log: List[str]) -> Test:
+ """
+ Finds next test to parse in LineStream, creates new Test object,
+ parses any subtests of the test, populates Test object with all
+ information (status, name) about the test and the Test objects for
+ any subtests, and then returns the Test object. The method accepts
+ three formats of tests:
+
+ Accepted test formats:
+
+ - Main KTAP/TAP header
+
+ Example:
+
+ KTAP version 1
+ 1..4
+ [subtests]
+
+ - Subtest header line
+
+ Example:
+
+ # Subtest: name
+ 1..3
+ [subtests]
+ ok 1 name
+
+ - Test result line
+
+ Example:
+
+ ok 1 - test
+
+ Parameters:
+ lines - LineStream of KTAP output to parse
+ expected_num - expected test number for test to be parsed
+ log - list of strings containing any preceding diagnostic lines
+ corresponding to the current test
+
+ Return:
+ Test object populated with characteristics and any subtests
+ """
+ test = Test()
+ test.log.extend(log)
+ parent_test = False
+ main = parse_ktap_header(lines, test)
+ if main:
+ # If KTAP/TAP header is found, attempt to parse
+ # test plan
+ test.name = "main"
+ parse_test_plan(lines, test)
+ else:
+ # If KTAP/TAP header is not found, test must be subtest
+ # header or test result line so parse attempt to parser
+ # subtest header
+ parent_test = parse_test_header(lines, test)
+ if parent_test:
+ # If subtest header is found, attempt to parse
+ # test plan and print header
+ parse_test_plan(lines, test)
+ print_test_header(test)
+ expected_count = test.expected_count
+ subtests = []
+ test_num = 1
+ while main or expected_count is None or test_num <= expected_count:
+ # Loop to parse any subtests.
+ # If test is main test, do not break until no lines left.
+ # Otherwise, break after parsing expected number of tests or
+ # if expected number of tests is unknown break when found
+ # test result line with matching name to subtest header.
+ if not lines:
+ if expected_count and test_num <= expected_count:
+ test.add_error('missing expected subtests!')
+ break
+ sub_log = parse_diagnostic(lines)
+ if not expected_count and not main and \
+ peek_test_name_match(lines, test):
+ test.log.extend(sub_log)
+ break
+ subtests.append(parse_test(lines, test_num, sub_log))
+ test_num += 1
+ test.subtests = subtests
+ if not main:
+ # If not main test, look for test result line
+ test.log.extend(parse_diagnostic(lines))
+ if (parent_test and peek_test_name_match(lines, test)) or \
+ not parent_test:
+ parse_test_result(lines, test, expected_num)
else:
- print_suite_divider(red('[FAILED] ') + test_suite.name)
- for test_case in test_suite.cases:
- if test_case.status == TestStatus.SUCCESS:
- counts.passed += 1
- print_with_timestamp(green('[PASSED] ') + test_case.name)
- elif test_case.status == TestStatus.SKIPPED:
- counts.skipped += 1
- print_with_timestamp(yellow('[SKIPPED] ') + test_case.name)
- elif test_case.status == TestStatus.TEST_CRASHED:
- counts.crashed += 1
- print_with_timestamp(red('[CRASHED] ' + test_case.name))
- print_log(map(yellow, test_case.log))
- print_with_timestamp('')
- else:
- counts.failed += 1
- print_with_timestamp(red('[FAILED] ') + test_case.name)
- print_log(map(yellow, test_case.log))
- print_with_timestamp('')
- return counts
+ test.add_error('missing subtest result line!')
+ # Add statuses to TestCounts attribute in Test object
+ bubble_up_test_results(test)
+ if parent_test:
+ # If test has subtests and is not the main test object, print
+ # footer.
+ print_test_footer(test)
+ elif not main:
+ print_test_result(test)
+ return test
def parse_run_tests(kernel_output: Iterable[str]) -> TestResult:
- counts = TestCounts()
+ """
+ Using kernel output, extract KTAP lines, parse the lines for test
+ results and print condensed test results and summary line .
+
+ Parameters:
+ kernel_output - Iterable object contains lines of kernel output
+
+ Return:
+ TestResult - Tuple containg status of main test object, main test
+ object with all subtests, and log of all KTAP lines.
+ """
+ print_with_timestamp(DIVIDER)
lines = extract_tap_lines(kernel_output)
- test_result = parse_test_result(lines)
- if test_result.status == TestStatus.NO_TESTS:
- print(red('[ERROR] ') + yellow('no tests run!'))
- elif test_result.status == TestStatus.FAILURE_TO_PARSE_TESTS:
- print(red('[ERROR] ') + yellow('could not parse test results!'))
+ test = Test()
+ if not lines:
+ test.add_error('invalid KTAP input!')
+ test.status = TestStatus.FAILURE_TO_PARSE_TESTS
else:
- counts = print_and_count_results(test_result)
+ test = parse_test(lines, 0, [])
+ if test.status != TestStatus.NO_TESTS:
+ test.status = test.counts.get_status()
print_with_timestamp(DIVIDER)
- if test_result.status == TestStatus.SUCCESS:
- fmt = green
- elif test_result.status == TestStatus.SKIPPED:
- fmt = yellow
- else:
- fmt =red
- print_with_timestamp(
- fmt('Testing complete. %d tests run. %d failed. %d crashed. %d skipped.' %
- (counts.total(), counts.failed, counts.crashed, counts.skipped)))
- return test_result
+ print_summary_line(test)
+ return TestResult(test.status, test, lines)
diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py
index 619c4554cbff..e527b90de8ea 100755
--- a/tools/testing/kunit/kunit_tool_test.py
+++ b/tools/testing/kunit/kunit_tool_test.py
@@ -106,10 +106,10 @@ class KUnitParserTest(unittest.TestCase):
with open(log_path) as file:
result = kunit_parser.extract_tap_lines(file.readlines())
self.assertContains('TAP version 14', result)
- self.assertContains(' # Subtest: example', result)
- self.assertContains(' 1..2', result)
- self.assertContains(' ok 1 - example_simple_test', result)
- self.assertContains(' ok 2 - example_mock_test', result)
+ self.assertContains('# Subtest: example', result)
+ self.assertContains('1..2', result)
+ self.assertContains('ok 1 - example_simple_test', result)
+ self.assertContains('ok 2 - example_mock_test', result)
self.assertContains('ok 1 - example', result)
def test_output_with_prefix_isolated_correctly(self):
@@ -117,28 +117,28 @@ class KUnitParserTest(unittest.TestCase):
with open(log_path) as file:
result = kunit_parser.extract_tap_lines(file.readlines())
self.assertContains('TAP version 14', result)
- self.assertContains(' # Subtest: kunit-resource-test', result)
- self.assertContains(' 1..5', result)
- self.assertContains(' ok 1 - kunit_resource_test_init_resources', result)
- self.assertContains(' ok 2 - kunit_resource_test_alloc_resource', result)
- self.assertContains(' ok 3 - kunit_resource_test_destroy_resource', result)
- self.assertContains(' foo bar #', result)
- self.assertContains(' ok 4 - kunit_resource_test_cleanup_resources', result)
- self.assertContains(' ok 5 - kunit_resource_test_proper_free_ordering', result)
+ self.assertContains('# Subtest: kunit-resource-test', result)
+ self.assertContains('1..5', result)
+ self.assertContains('ok 1 - kunit_resource_test_init_resources', result)
+ self.assertContains('ok 2 - kunit_resource_test_alloc_resource', result)
+ self.assertContains('ok 3 - kunit_resource_test_destroy_resource', result)
+ self.assertContains('foo bar #', result)
+ self.assertContains('ok 4 - kunit_resource_test_cleanup_resources', result)
+ self.assertContains('ok 5 - kunit_resource_test_proper_free_ordering', result)
self.assertContains('ok 1 - kunit-resource-test', result)
- self.assertContains(' foo bar # non-kunit output', result)
- self.assertContains(' # Subtest: kunit-try-catch-test', result)
- self.assertContains(' 1..2', result)
- self.assertContains(' ok 1 - kunit_test_try_catch_successful_try_no_catch',
+ self.assertContains('foo bar # non-kunit output', result)
+ self.assertContains('# Subtest: kunit-try-catch-test', result)
+ self.assertContains('1..2', result)
+ self.assertContains('ok 1 - kunit_test_try_catch_successful_try_no_catch',
result)
- self.assertContains(' ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch',
+ self.assertContains('ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch',
result)
self.assertContains('ok 2 - kunit-try-catch-test', result)
- self.assertContains(' # Subtest: string-stream-test', result)
- self.assertContains(' 1..3', result)
- self.assertContains(' ok 1 - string_stream_test_empty_on_creation', result)
- self.assertContains(' ok 2 - string_stream_test_not_empty_after_add', result)
- self.assertContains(' ok 3 - string_stream_test_get_string', result)
+ self.assertContains('# Subtest: string-stream-test', result)
+ self.assertContains('1..3', result)
+ self.assertContains('ok 1 - string_stream_test_empty_on_creation', result)
+ self.assertContains('ok 2 - string_stream_test_not_empty_after_add', result)
+ self.assertContains('ok 3 - string_stream_test_get_string', result)
self.assertContains('ok 3 - string-stream-test', result)
def test_parse_successful_test_log(self):
@@ -148,6 +148,13 @@ class KUnitParserTest(unittest.TestCase):
self.assertEqual(
kunit_parser.TestStatus.SUCCESS,
result.status)
+ def test_parse_successful_nested_tests_log(self):
+ all_passed_log = test_data_path('test_is_test_passed-all_passed_nested.log')
+ with open(all_passed_log) as file:
+ result = kunit_parser.parse_run_tests(file.readlines())
+ self.assertEqual(
+ kunit_parser.TestStatus.SUCCESS,
+ result.status)
def test_parse_failed_test_log(self):
failed_log = test_data_path('test_is_test_passed-failure.log')
@@ -162,17 +169,31 @@ class KUnitParserTest(unittest.TestCase):
with open(empty_log) as file:
result = kunit_parser.parse_run_tests(
kunit_parser.extract_tap_lines(file.readlines()))
- self.assertEqual(0, len(result.suites))
+ self.assertEqual(0, len(result.test.subtests))
self.assertEqual(
kunit_parser.TestStatus.FAILURE_TO_PARSE_TESTS,
result.status)
+ def test_missing_test_plan(self):
+ missing_plan_log = test_data_path('test_is_test_passed-'
+ 'missing_plan.log')
+ with open(missing_plan_log) as file:
+ result = kunit_parser.parse_run_tests(
+ kunit_parser.extract_tap_lines(
+ file.readlines()))
+ self.assertEqual(2, result.test.counts.errors)
+ self.assertEqual(
+ kunit_parser.TestStatus.SUCCESS,
+ result.status)
+
def test_no_tests(self):
- empty_log = test_data_path('test_is_test_passed-no_tests_run_with_header.log')
- with open(empty_log) as file:
+ header_log = test_data_path('test_is_test_passed-'
+ 'no_tests_run_with_header.log')
+ with open(header_log) as file:
result = kunit_parser.parse_run_tests(
- kunit_parser.extract_tap_lines(file.readlines()))
- self.assertEqual(0, len(result.suites))
+ kunit_parser.extract_tap_lines(
+ file.readlines()))
+ self.assertEqual(0, len(result.test.subtests))
self.assertEqual(
kunit_parser.TestStatus.NO_TESTS,
result.status)
@@ -182,15 +203,17 @@ class KUnitParserTest(unittest.TestCase):
print_mock = mock.patch('builtins.print').start()
with open(crash_log) as file:
result = kunit_parser.parse_run_tests(
- kunit_parser.extract_tap_lines(file.readlines()))
- print_mock.assert_any_call(StrContains('could not parse test results!'))
+ kunit_parser.extract_tap_lines(
+ file.readlines()))
+ print_mock.assert_any_call(StrContains('invalid KTAP input!'))
print_mock.stop()
file.close()
def test_crashed_test(self):
crashed_log = test_data_path('test_is_test_passed-crash.log')
with open(crashed_log) as file:
- result = kunit_parser.parse_run_tests(file.readlines())
+ result = kunit_parser.parse_run_tests(
+ file.readlines())
self.assertEqual(
kunit_parser.TestStatus.TEST_CRASHED,
result.status)
@@ -216,6 +239,23 @@ class KUnitParserTest(unittest.TestCase):
result.status)
file.close()
+ def test_ignores_hyphen(self):
+ hyphen_log = test_data_path('test_strip_hyphen.log')
+ file = open(hyphen_log)
+ result = kunit_parser.parse_run_tests(file.readlines())
+
+ # A skipped test does not fail the whole suite.
+ self.assertEqual(
+ kunit_parser.TestStatus.SUCCESS,
+ result.status)
+ self.assertEqual(
+ "sysctl_test",
+ result.test.subtests[0].name)
+ self.assertEqual(
+ "example",
+ result.test.subtests[1].name)
+ file.close()
+
def test_ignores_prefix_printk_time(self):
prefix_log = test_data_path('test_config_printk_time.log')
@@ -224,7 +264,7 @@ class KUnitParserTest(unittest.TestCase):
self.assertEqual(
kunit_parser.TestStatus.SUCCESS,
result.status)
- self.assertEqual('kunit-resource-test', result.suites[0].name)
+ self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
def test_ignores_multiple_prefixes(self):
prefix_log = test_data_path('test_multiple_prefixes.log')
@@ -233,7 +273,7 @@ class KUnitParserTest(unittest.TestCase):
self.assertEqual(
kunit_parser.TestStatus.SUCCESS,
result.status)
- self.assertEqual('kunit-resource-test', result.suites[0].name)
+ self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
def test_prefix_mixed_kernel_output(self):
mixed_prefix_log = test_data_path('test_interrupted_tap_output.log')
@@ -242,7 +282,7 @@ class KUnitParserTest(unittest.TestCase):
self.assertEqual(
kunit_parser.TestStatus.SUCCESS,
result.status)
- self.assertEqual('kunit-resource-test', result.suites[0].name)
+ self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
def test_prefix_poundsign(self):
pound_log = test_data_path('test_pound_sign.log')
@@ -251,16 +291,16 @@ class KUnitParserTest(unittest.TestCase):
self.assertEqual(
kunit_parser.TestStatus.SUCCESS,
result.status)
- self.assertEqual('kunit-resource-test', result.suites[0].name)
+ self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
def test_kernel_panic_end(self):
panic_log = test_data_path('test_kernel_panic_interrupt.log')
with open(panic_log) as file:
result = kunit_parser.parse_run_tests(file.readlines())
self.assertEqual(
- kunit_parser.TestStatus.TEST_CRASHED,
+ kunit_parser.TestStatus.SUCCESS,
result.status)
- self.assertEqual('kunit-resource-test', result.suites[0].name)
+ self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
def test_pound_no_prefix(self):
pound_log = test_data_path('test_pound_no_prefix.log')
@@ -269,7 +309,7 @@ class KUnitParserTest(unittest.TestCase):
self.assertEqual(
kunit_parser.TestStatus.SUCCESS,
result.status)
- self.assertEqual('kunit-resource-test', result.suites[0].name)
+ self.assertEqual('kunit-resource-test', result.test.subtests[0].name)
class LinuxSourceTreeTest(unittest.TestCase):
@@ -291,6 +331,14 @@ class LinuxSourceTreeTest(unittest.TestCase):
pass
tree = kunit_kernel.LinuxSourceTree('', kunitconfig_path=dir)
+ def test_kselftest_nested(self):
+ kselftest_log = test_data_path('test_is_test_passed-kselftest.log')
+ with open(kselftest_log) as file:
+ result = kunit_parser.parse_run_tests(file.readlines())
+ self.assertEqual(
+ kunit_parser.TestStatus.SUCCESS,
+ result.status)
+
# TODO: add more test cases.
@@ -322,6 +370,12 @@ class KUnitJsonTest(unittest.TestCase):
result = self._json_for('test_is_test_passed-no_tests_run_with_header.log')
self.assertEqual(0, len(result['sub_groups']))
+ def test_nested_json(self):
+ result = self._json_for('test_is_test_passed-all_passed_nested.log')
+ self.assertEqual(
+ {'name': 'example_simple_test', 'status': 'PASS'},
+ result["sub_groups"][0]["sub_groups"][0]["test_cases"][0])
+
class StrContains(str):
def __eq__(self, other):
return self in other
@@ -380,7 +434,7 @@ class KUnitMainTest(unittest.TestCase):
self.assertEqual(e.exception.code, 1)
self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1)
self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)
- self.print_mock.assert_any_call(StrContains(' 0 tests run'))
+ self.print_mock.assert_any_call(StrContains('invalid KTAP input!'))
def test_exec_raw_output(self):
self.linux_source_mock.run_kernel = mock.Mock(return_value=[])
@@ -388,7 +442,7 @@ class KUnitMainTest(unittest.TestCase):
self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)
for call in self.print_mock.call_args_list:
self.assertNotEqual(call, mock.call(StrContains('Testing complete.')))
- self.assertNotEqual(call, mock.call(StrContains(' 0 tests run')))
+ self.assertNotEqual(call, mock.call(StrContains(' 0 tests run!')))
def test_run_raw_output(self):
self.linux_source_mock.run_kernel = mock.Mock(return_value=[])
@@ -397,7 +451,7 @@ class KUnitMainTest(unittest.TestCase):
self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)
for call in self.print_mock.call_args_list:
self.assertNotEqual(call, mock.call(StrContains('Testing complete.')))
- self.assertNotEqual(call, mock.call(StrContains(' 0 tests run')))
+ self.assertNotEqual(call, mock.call(StrContains(' 0 tests run!')))
def test_run_raw_output_kunit(self):
self.linux_source_mock.run_kernel = mock.Mock(return_value=[])
diff --git a/tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log b/tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
new file mode 100644
index 000000000000..9d5b04fe43a6
--- /dev/null
+++ b/tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
@@ -0,0 +1,34 @@
+TAP version 14
+1..2
+ # Subtest: sysctl_test
+ 1..4
+ # sysctl_test_dointvec_null_tbl_data: sysctl_test_dointvec_null_tbl_data passed
+ ok 1 - sysctl_test_dointvec_null_tbl_data
+ # Subtest: example
+ 1..2
+ init_suite
+ # example_simple_test: initializing
+ # example_simple_test: example_simple_test passed
+ ok 1 - example_simple_test
+ # example_mock_test: initializing
+ # example_mock_test: example_mock_test passed
+ ok 2 - example_mock_test
+ kunit example: all tests passed
+ ok 2 - example
+ # sysctl_test_dointvec_table_len_is_zero: sysctl_test_dointvec_table_len_is_zero passed
+ ok 3 - sysctl_test_dointvec_table_len_is_zero
+ # sysctl_test_dointvec_table_read_but_position_set: sysctl_test_dointvec_table_read_but_position_set passed
+ ok 4 - sysctl_test_dointvec_table_read_but_position_set
+kunit sysctl_test: all tests passed
+ok 1 - sysctl_test
+ # Subtest: example
+ 1..2
+init_suite
+ # example_simple_test: initializing
+ # example_simple_test: example_simple_test passed
+ ok 1 - example_simple_test
+ # example_mock_test: initializing
+ # example_mock_test: example_mock_test passed
+ ok 2 - example_mock_test
+kunit example: all tests passed
+ok 2 - example
diff --git a/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log b/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log
new file mode 100644
index 000000000000..65d3f27feaf2
--- /dev/null
+++ b/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log
@@ -0,0 +1,14 @@
+TAP version 13
+1..2
+# selftests: membarrier: membarrier_test_single_thread
+# TAP version 13
+# 1..2
+# ok 1 sys_membarrier available
+# ok 2 sys membarrier invalid command test: command = -1, flags = 0, errno = 22. Failed as expected
+ok 1 selftests: membarrier: membarrier_test_single_thread
+# selftests: membarrier: membarrier_test_multi_thread
+# TAP version 13
+# 1..2
+# ok 1 sys_membarrier available
+# ok 2 sys membarrier invalid command test: command = -1, flags = 0, errno = 22. Failed as expected
+ok 2 selftests: membarrier: membarrier_test_multi_thread
diff --git a/tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log b/tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log
new file mode 100644
index 000000000000..5cd17b7f818a
--- /dev/null
+++ b/tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log
@@ -0,0 +1,31 @@
+KTAP version 1
+ # Subtest: sysctl_test
+ # sysctl_test_dointvec_null_tbl_data: sysctl_test_dointvec_null_tbl_data passed
+ ok 1 - sysctl_test_dointvec_null_tbl_data
+ # sysctl_test_dointvec_table_maxlen_unset: sysctl_test_dointvec_table_maxlen_unset passed
+ ok 2 - sysctl_test_dointvec_table_maxlen_unset
+ # sysctl_test_dointvec_table_len_is_zero: sysctl_test_dointvec_table_len_is_zero passed
+ ok 3 - sysctl_test_dointvec_table_len_is_zero
+ # sysctl_test_dointvec_table_read_but_position_set: sysctl_test_dointvec_table_read_but_position_set passed
+ ok 4 - sysctl_test_dointvec_table_read_but_position_set
+ # sysctl_test_dointvec_happy_single_positive: sysctl_test_dointvec_happy_single_positive passed
+ ok 5 - sysctl_test_dointvec_happy_single_positive
+ # sysctl_test_dointvec_happy_single_negative: sysctl_test_dointvec_happy_single_negative passed
+ ok 6 - sysctl_test_dointvec_happy_single_negative
+ # sysctl_test_dointvec_single_less_int_min: sysctl_test_dointvec_single_less_int_min passed
+ ok 7 - sysctl_test_dointvec_single_less_int_min
+ # sysctl_test_dointvec_single_greater_int_max: sysctl_test_dointvec_single_greater_int_max passed
+ ok 8 - sysctl_test_dointvec_single_greater_int_max
+kunit sysctl_test: all tests passed
+ok 1 - sysctl_test
+ # Subtest: example
+ 1..2
+init_suite
+ # example_simple_test: initializing
+ # example_simple_test: example_simple_test passed
+ ok 1 - example_simple_test
+ # example_mock_test: initializing
+ # example_mock_test: example_mock_test passed
+ ok 2 - example_mock_test
+kunit example: all tests passed
+ok 2 - example
diff --git a/tools/testing/kunit/test_data/test_strip_hyphen.log b/tools/testing/kunit/test_data/test_strip_hyphen.log
new file mode 100644
index 000000000000..92ac7c24b374
--- /dev/null
+++ b/tools/testing/kunit/test_data/test_strip_hyphen.log
@@ -0,0 +1,16 @@
+KTAP version 1
+1..2
+ # Subtest: sysctl_test
+ 1..1
+ # sysctl_test_dointvec_null_tbl_data: sysctl_test_dointvec_null_tbl_data passed
+ ok 1 - sysctl_test_dointvec_null_tbl_data
+kunit sysctl_test: all tests passed
+ok 1 - sysctl_test
+ # Subtest: example
+ 1..1
+init_suite
+ # example_simple_test: initializing
+ # example_simple_test: example_simple_test passed
+ ok 1 example_simple_test
+kunit example: all tests passed
+ok 2 example
--
2.33.0.259.gc128427fd7-goog
2 years, 11 months
- 2
- 2
[PATCH v7 0/6] cgroup/cpuset: Add new cpuset partition type & empty effecitve cpus
by Waiman Long
v7:
- Simplify the documentation patch (patch 5) as suggested by Tejun.
- Fix a typo in patch 2 and improper commit log in patch 3.
v6:
- Remove duplicated tmpmask from update_prstate() which should fix the
frame size too large problem reported by kernel test robot.
v5:
- Rebased to the latest for-5.15 branch of cgroup git tree and drop the
1st v4 patch as it has been merged.
- Update patch 1 to always allow changing partition root back to member
even if it invalidates child partitions undeneath it.
- Adjust the empty effective cpu partition patch to not allow 0 effective
cpu for terminal partition which will make it invalid).
- Add a new patch to enable reading of cpuset.cpus.partition to display
the reason that causes invalid partition.
- Adjust the documentation and testing patch accordingly.
This patchset makes four enhancements to the cpuset v2 code.
Patch 1: Properly handle partition root tree and make partition
invalid in case changes to cpuset.cpus violate any of the partition
root constraints.
Patch 2: Enable the "cpuset.cpus.partition" file to show the reason
that causes invalid partition like "root invalid (No cpu available
due to hotplug)".
Patch 3: Add a new partition state "isolated" to create a partition
root without load balancing. This is for handling intermitten workloads
that have a strict low latency requirement.
Patch 4: Allow partition roots that are not the top cpuset to distribute
all its cpus to child partitions as long as there is no task associated
with that partition root. This allows more flexibility for middleware
to manage multiple partitions.
Patch 5 updates the cgroup-v2.rst file accordingly. Patch 6 adds a new
cpuset test to test the new cpuset partition code.
Waiman Long (6):
cgroup/cpuset: Properly transition to invalid partition
cgroup/cpuset: Show invalid partition reason string
cgroup/cpuset: Add a new isolated cpus.partition type
cgroup/cpuset: Allow non-top parent partition to distribute out all
CPUs
cgroup/cpuset: Update description of cpuset.cpus.partition in
cgroup-v2.rst
kselftest/cgroup: Add cpuset v2 partition root state test
Documentation/admin-guide/cgroup-v2.rst | 112 +--
kernel/cgroup/cpuset.c | 337 ++++++---
tools/testing/selftests/cgroup/Makefile | 5 +-
.../selftests/cgroup/test_cpuset_prs.sh | 663 ++++++++++++++++++
tools/testing/selftests/cgroup/wait_inotify.c | 86 +++
5 files changed, 1050 insertions(+), 153 deletions(-)
create mode 100755 tools/testing/selftests/cgroup/test_cpuset_prs.sh
create mode 100644 tools/testing/selftests/cgroup/wait_inotify.c
--
2.18.1
2 years, 11 months
- 4
- 15
[PATCH RESEND 00/17] Resend bitmap patches
by Yury Norov
This is a resend of previously submitted series:
https://lore.kernel.org/patchwork/cover/1462071/
https://lore.kernel.org/patchwork/patch/1458703/
https://lore.kernel.org/lkml/YPG8SdsbQ+sxjk0w@yury-ThinkPad/T/
https://lore.kernel.org/lkml/YMVSHCY9yEocmfVD@yury-ThinkPad/T/
Most of the patches received testing and review. If I missed to
add someone's review tag putting all together - my kind apologise.
Please resend it here.
I believe I addessed all comments except Joe's one. In comment to patch 3,
Joe Perches suggested to rename include/linux/find.h, but didn't give a
new name, so I leave it as is. Since this header is not for direct
inclusion, I'm OK with any reasonable name, and we can change it later.
Andrew, can you please take this series in linux-next?
Andy Shevchenko (1):
tools: Rename bitmap_alloc() to bitmap_zalloc()
Yury Norov (16):
bitops: protect find_first_{,zero}_bit properly
bitops: move find_bit_*_le functions from le.h to find.h
include: move find.h from asm_generic to linux
arch: remove GENERIC_FIND_FIRST_BIT entirely
lib: add find_first_and_bit()
cpumask: use find_first_and_bit()
all: replace find_next{,_zero}_bit with find_first{,_zero}_bit where
appropriate
tools: sync tools/bitmap with mother linux
cpumask: replace cpumask_next_* with cpumask_first_* where appropriate
include/linux: move for_each_bit() macros from bitops.h to find.h
find: micro-optimize for_each_{set,clear}_bit()
Replace for_each_*_bit_from() with for_each_*_bit() where appropriate
mm/percpu: micro-optimize pcpu_is_populated()
bitmap: unify find_bit operations
lib: bitmap: add performance test for bitmap_print_to_pagebuf
vsprintf: rework bitmap_list_string
MAINTAINERS | 4 +-
arch/alpha/include/asm/bitops.h | 2 -
arch/arc/Kconfig | 1 -
arch/arc/include/asm/bitops.h | 1 -
arch/arm/include/asm/bitops.h | 1 -
arch/arm64/Kconfig | 1 -
arch/arm64/include/asm/bitops.h | 1 -
arch/csky/include/asm/bitops.h | 1 -
arch/h8300/include/asm/bitops.h | 1 -
arch/hexagon/include/asm/bitops.h | 1 -
arch/ia64/include/asm/bitops.h | 2 -
arch/m68k/include/asm/bitops.h | 2 -
arch/mips/Kconfig | 1 -
arch/mips/include/asm/bitops.h | 1 -
arch/openrisc/include/asm/bitops.h | 1 -
arch/parisc/include/asm/bitops.h | 2 -
arch/powerpc/include/asm/bitops.h | 2 -
arch/powerpc/include/asm/cputhreads.h | 2 +-
arch/powerpc/platforms/pasemi/dma_lib.c | 4 +-
arch/riscv/include/asm/bitops.h | 1 -
arch/s390/Kconfig | 1 -
arch/s390/include/asm/bitops.h | 1 -
arch/s390/kvm/kvm-s390.c | 2 +-
arch/sh/include/asm/bitops.h | 1 -
arch/sparc/include/asm/bitops_32.h | 1 -
arch/sparc/include/asm/bitops_64.h | 2 -
arch/x86/Kconfig | 1 -
arch/x86/include/asm/bitops.h | 2 -
arch/x86/kernel/apic/vector.c | 4 +-
arch/x86/um/Kconfig | 1 -
arch/xtensa/include/asm/bitops.h | 1 -
block/blk-mq.c | 2 +-
drivers/block/rnbd/rnbd-clt.c | 2 +-
drivers/dma/ti/edma.c | 2 +-
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +-
drivers/hwmon/ltc2992.c | 3 +-
drivers/iio/adc/ad7124.c | 2 +-
drivers/infiniband/hw/irdma/hw.c | 16 +-
drivers/media/cec/core/cec-core.c | 2 +-
drivers/media/mc/mc-devnode.c | 2 +-
drivers/mmc/host/renesas_sdhi_core.c | 2 +-
drivers/net/virtio_net.c | 2 +-
drivers/pci/controller/dwc/pci-dra7xx.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 10 +-
drivers/soc/fsl/qbman/bman_portal.c | 2 +-
drivers/soc/fsl/qbman/qman_portal.c | 2 +-
drivers/soc/ti/k3-ringacc.c | 4 +-
drivers/tty/n_tty.c | 2 +-
drivers/virt/acrn/ioreq.c | 3 +-
fs/f2fs/segment.c | 8 +-
fs/ocfs2/cluster/heartbeat.c | 2 +-
fs/ocfs2/dlm/dlmdomain.c | 4 +-
fs/ocfs2/dlm/dlmmaster.c | 18 +-
fs/ocfs2/dlm/dlmrecovery.c | 2 +-
fs/ocfs2/dlm/dlmthread.c | 2 +-
include/asm-generic/bitops.h | 1 -
include/asm-generic/bitops/le.h | 64 ---
include/linux/bitmap.h | 34 +-
include/linux/bitops.h | 34 --
include/linux/cpumask.h | 46 ++-
include/linux/find.h | 372 ++++++++++++++++++
kernel/time/clocksource.c | 4 +-
lib/Kconfig | 3 -
lib/find_bit.c | 21 +
lib/find_bit_benchmark.c | 21 +
lib/genalloc.c | 2 +-
lib/test_bitmap.c | 37 ++
lib/vsprintf.c | 24 +-
mm/percpu.c | 35 +-
net/ncsi/ncsi-manage.c | 4 +-
tools/include/asm-generic/bitops.h | 1 -
tools/include/asm-generic/bitops/find.h | 145 -------
tools/include/linux/bitmap.h | 11 +-
.../bitops => tools/include/linux}/find.h | 54 ++-
tools/lib/find_bit.c | 20 +
tools/perf/bench/find-bit-bench.c | 2 +-
tools/perf/builtin-c2c.c | 6 +-
tools/perf/builtin-record.c | 2 +-
tools/perf/tests/bitmap.c | 2 +-
tools/perf/tests/mem2node.c | 2 +-
tools/perf/util/affinity.c | 4 +-
tools/perf/util/header.c | 4 +-
tools/perf/util/metricgroup.c | 2 +-
tools/perf/util/mmap.c | 4 +-
.../selftests/kvm/dirty_log_perf_test.c | 2 +-
tools/testing/selftests/kvm/dirty_log_test.c | 4 +-
.../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 +-
87 files changed, 657 insertions(+), 461 deletions(-)
create mode 100644 include/linux/find.h
delete mode 100644 tools/include/asm-generic/bitops/find.h
rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%)
--
2.30.2
2 years, 11 months
- 3
- 25
[PATCH v2] lib: use of kunit in test_parman.c
by José Aquiles Guedes de Rezende
Convert the parman test module to use the KUnit test framework.
This makes the test clearer by leveraging KUnit's assertion macros
and test case definitions,as well as helps standardize on a testing framework.
Co-developed-by: Matheus Henrique de Souza Silva <matheushenriquedesouzasilva(a)protonmail.com>
Signed-off-by: Matheus Henrique de Souza Silva <matheushenriquedesouzasilva(a)protonmail.com>
Signed-off-by: José Aquiles Guedes de Rezende <jjoseaquiless(a)gmail.com>
---
Changes in v2:
- Rename TEST_PARMAN config item to PARMAN_KUNIT_TEST
and make it work with the kunit framework.
- Change KUNIT_ASSERT_EQ to KUNIT_ASSERT_EQ_MSG.
- Call test_parman_resize(test_parman, 0) when parman_create fail
- Remove kunit_kfree.
- Remove "\n" in error messages
- Remove casts to unsigned long
lib/Kconfig.debug | 13 +++--
lib/Makefile | 2 +-
lib/test_parman.c | 145 +++++++++++++++++++---------------------------
3 files changed, 70 insertions(+), 90 deletions(-)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 831212722924..e68a27e5e5b0 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2231,12 +2231,15 @@ config TEST_HASH
config TEST_IDA
tristate "Perform selftest on IDA functions"
-config TEST_PARMAN
- tristate "Perform selftest on priority array manager"
- depends on PARMAN
+config PARMAN_KUNIT_TEST
+ tristate "Kunit test for priority array manager" if !KUNIT_ALL_TESTS
+ select PARMAN
+ depends on KUNIT
+ default KUNIT_ALL_TESTS
help
- Enable this option to test priority array manager on boot
- (or module load).
+ Enable this option to test priority array manager on boot.
+ For more information on KUnit and unit tests in general please refer
+ to the KUnit documentation in Documentation/dev-tools/kunit/.
If unsure, say N.
diff --git a/lib/Makefile b/lib/Makefile
index 5efd1b435a37..deb8946735e8 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -88,7 +88,7 @@ obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o
obj-$(CONFIG_TEST_STRSCPY) += test_strscpy.o
obj-$(CONFIG_TEST_UUID) += test_uuid.o
obj-$(CONFIG_TEST_XARRAY) += test_xarray.o
-obj-$(CONFIG_TEST_PARMAN) += test_parman.o
+obj-$(CONFIG_PARMAN_KUNIT_TEST) += test_parman.o
obj-$(CONFIG_TEST_KMOD) += test_kmod.o
obj-$(CONFIG_TEST_DEBUG_VIRTUAL) += test_debug_virtual.o
obj-$(CONFIG_TEST_MEMCAT_P) += test_memcat_p.o
diff --git a/lib/test_parman.c b/lib/test_parman.c
index 35e32243693c..512f874bc71c 100644
--- a/lib/test_parman.c
+++ b/lib/test_parman.c
@@ -41,6 +41,8 @@
#include <linux/err.h>
#include <linux/random.h>
#include <linux/parman.h>
+#include <linux/sched.h>
+#include <kunit/test.h>
#define TEST_PARMAN_PRIO_SHIFT 7 /* defines number of prios for testing */
#define TEST_PARMAN_PRIO_COUNT BIT(TEST_PARMAN_PRIO_SHIFT)
@@ -91,12 +93,14 @@ struct test_parman {
static int test_parman_resize(void *priv, unsigned long new_count)
{
+ struct kunit *test = current->kunit_test;
struct test_parman *test_parman = priv;
struct test_parman_item **prio_array;
unsigned long old_count;
prio_array = krealloc(test_parman->prio_array,
ITEM_PTRS_SIZE(new_count), GFP_KERNEL);
+ KUNIT_EXPECT_NOT_ERR_OR_NULL(test, prio_array);
if (new_count == 0)
return 0;
if (!prio_array)
@@ -214,42 +218,41 @@ static void test_parman_items_fini(struct test_parman *test_parman)
}
}
-static struct test_parman *test_parman_create(const struct parman_ops *ops)
+static int test_parman_create(struct kunit *test)
{
struct test_parman *test_parman;
int err;
- test_parman = kzalloc(sizeof(*test_parman), GFP_KERNEL);
- if (!test_parman)
- return ERR_PTR(-ENOMEM);
+ test_parman = kunit_kzalloc(test, sizeof(*test_parman), GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, test_parman);
+
err = test_parman_resize(test_parman, TEST_PARMAN_BASE_COUNT);
- if (err)
- goto err_resize;
- test_parman->parman = parman_create(ops, test_parman);
- if (!test_parman->parman) {
- err = -ENOMEM;
- goto err_parman_create;
+ KUNIT_ASSERT_EQ_MSG(test, err, 0, "test_parman_resize failed");
+
+ test_parman->parman = parman_create(&test_parman_lsort_ops, test_parman);
+ if (IS_ERR_OR_NULL(test_parman->parman)) {
+ test_parman_resize(test_parman, 0);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, test_parman->parman);
}
+
test_parman_rnd_init(test_parman);
test_parman_prios_init(test_parman);
test_parman_items_init(test_parman);
test_parman->run_budget = TEST_PARMAN_RUN_BUDGET;
- return test_parman;
-
-err_parman_create:
- test_parman_resize(test_parman, 0);
-err_resize:
- kfree(test_parman);
- return ERR_PTR(err);
+ test->priv = test_parman;
+ return 0;
}
-static void test_parman_destroy(struct test_parman *test_parman)
+static void test_parman_destroy(struct kunit *test)
{
+ struct test_parman *test_parman = test->priv;
+
+ if (!test_parman)
+ return;
test_parman_items_fini(test_parman);
test_parman_prios_fini(test_parman);
parman_destroy(test_parman->parman);
test_parman_resize(test_parman, 0);
- kfree(test_parman);
}
static bool test_parman_run_check_budgets(struct test_parman *test_parman)
@@ -265,8 +268,9 @@ static bool test_parman_run_check_budgets(struct test_parman *test_parman)
return true;
}
-static int test_parman_run(struct test_parman *test_parman)
+static void test_parman_run(struct kunit *test)
{
+ struct test_parman *test_parman = test->priv;
unsigned int i = test_parman_rnd_get(test_parman);
int err;
@@ -281,8 +285,8 @@ static int test_parman_run(struct test_parman *test_parman)
err = parman_item_add(test_parman->parman,
&item->prio->parman_prio,
&item->parman_item);
- if (err)
- return err;
+ KUNIT_ASSERT_EQ_MSG(test, err, 0, "parman_item_add failed");
+
test_parman->prio_array[item->parman_item.index] = item;
test_parman->used_items++;
} else {
@@ -294,22 +298,19 @@ static int test_parman_run(struct test_parman *test_parman)
}
item->used = !item->used;
}
- return 0;
}
-static int test_parman_check_array(struct test_parman *test_parman,
- bool gaps_allowed)
+static void test_parman_check_array(struct kunit *test, bool gaps_allowed)
{
unsigned int last_unused_items = 0;
unsigned long last_priority = 0;
unsigned int used_items = 0;
int i;
+ struct test_parman *test_parman = test->priv;
- if (test_parman->prio_array_limit < TEST_PARMAN_BASE_COUNT) {
- pr_err("Array limit is lower than the base count (%lu < %lu)\n",
- test_parman->prio_array_limit, TEST_PARMAN_BASE_COUNT);
- return -EINVAL;
- }
+ KUNIT_ASSERT_GE_MSG(test, test_parman->prio_array_limit, TEST_PARMAN_BASE_COUNT,
+ "Array limit is lower than the base count (%lu < %lu)",
+ test_parman->prio_array_limit, TEST_PARMAN_BASE_COUNT);
for (i = 0; i < test_parman->prio_array_limit; i++) {
struct test_parman_item *item = test_parman->prio_array[i];
@@ -318,77 +319,53 @@ static int test_parman_check_array(struct test_parman *test_parman,
last_unused_items++;
continue;
}
- if (last_unused_items && !gaps_allowed) {
- pr_err("Gap found in array even though they are forbidden\n");
- return -EINVAL;
- }
+
+ KUNIT_ASSERT_FALSE_MSG(test, last_unused_items && !gaps_allowed,
+ "Gap found in array even though they are forbidden");
last_unused_items = 0;
used_items++;
- if (item->prio->priority < last_priority) {
- pr_err("Item belongs under higher priority then the last one (current: %lu, previous: %lu)\n",
- item->prio->priority, last_priority);
- return -EINVAL;
- }
- last_priority = item->prio->priority;
+ KUNIT_ASSERT_GE_MSG(test, item->prio->priority, last_priority,
+ "Item belongs under higher priority then the last one (current: %lu, previous: %lu)",
+ item->prio->priority, last_priority);
- if (item->parman_item.index != i) {
- pr_err("Item has different index in compare to where it actually is (%lu != %d)\n",
- item->parman_item.index, i);
- return -EINVAL;
- }
- }
+ last_priority = item->prio->priority;
- if (used_items != test_parman->used_items) {
- pr_err("Number of used items in array does not match (%u != %u)\n",
- used_items, test_parman->used_items);
- return -EINVAL;
- }
+ KUNIT_ASSERT_EQ_MSG(test, item->parman_item.index, i,
+ "Item has different index in compare to where it actually is (%lu != %d)",
+ item->parman_item.index, i);
- if (last_unused_items >= TEST_PARMAN_RESIZE_STEP_COUNT) {
- pr_err("Number of unused item at the end of array is bigger than resize step (%u >= %lu)\n",
- last_unused_items, TEST_PARMAN_RESIZE_STEP_COUNT);
- return -EINVAL;
}
- pr_info("Priority array check successful\n");
+ KUNIT_ASSERT_EQ_MSG(test, used_items, test_parman->used_items,
+ "Number of used items in array does not match (%u != %u)",
+ used_items, test_parman->used_items);
- return 0;
+ KUNIT_ASSERT_LT_MSG(test, last_unused_items, TEST_PARMAN_RESIZE_STEP_COUNT,
+ "Number of unused item at the end of array is bigger than resize step (%u >= %lu)",
+ last_unused_items, TEST_PARMAN_RESIZE_STEP_COUNT);
}
-static int test_parman_lsort(void)
+static void test_parman_lsort(struct kunit *test)
{
- struct test_parman *test_parman;
- int err;
-
- test_parman = test_parman_create(&test_parman_lsort_ops);
- if (IS_ERR(test_parman))
- return PTR_ERR(test_parman);
-
- err = test_parman_run(test_parman);
- if (err)
- goto out;
-
- err = test_parman_check_array(test_parman, false);
- if (err)
- goto out;
-out:
- test_parman_destroy(test_parman);
- return err;
+ test_parman_run(test);
+ test_parman_check_array(test, false);
}
-static int __init test_parman_init(void)
-{
- return test_parman_lsort();
-}
+static struct kunit_case parman_test_case[] = {
+ KUNIT_CASE(test_parman_lsort),
+ {}
+};
-static void __exit test_parman_exit(void)
-{
-}
+static struct kunit_suite parman_test_suite = {
+ .name = "parman",
+ .init = test_parman_create,
+ .exit = test_parman_destroy,
+ .test_cases = parman_test_case,
+};
-module_init(test_parman_init);
-module_exit(test_parman_exit);
+kunit_test_suite(parman_test_suite);
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Jiri Pirko <jiri(a)mellanox.com>");
--
2.32.0
2 years, 11 months
- 3
- 2
[PATCH 0/3] Add RFC-7597 Section 5.1 PSID support
by Cole Dishington
Thanks for your time reviewing!
Changes in v4:
- Handle special case of no offset bits (a=0 / A=2^16).
Cole Dishington (3):
net: netfilter: Add RFC-7597 Section 5.1 PSID support xtables API
net: netfilter: Add RFC-7597 Section 5.1 PSID support
selftests: netfilter: Add RFC-7597 Section 5.1 PSID selftests
include/uapi/linux/netfilter/nf_nat.h | 3 +-
net/netfilter/nf_nat_core.c | 39 +++-
net/netfilter/nf_nat_masquerade.c | 20 +-
net/netfilter/xt_MASQUERADE.c | 44 ++++-
.../netfilter/nat_masquerade_psid.sh | 182 ++++++++++++++++++
5 files changed, 276 insertions(+), 12 deletions(-)
create mode 100644 tools/testing/selftests/netfilter/nat_masquerade_psid.sh
--
2.32.0
2 years, 11 months
- 3
- 14
[net-next, v4, 00/11] ptp: support virtual clocks and timestamping
by Yangbo Lu
Current PTP driver exposes one PTP device to user which binds network
interface/interfaces to provide timestamping. Actually we have a way
utilizing timecounter/cyclecounter to virtualize any number of PTP
clocks based on a same free running physical clock for using.
The purpose of having multiple PTP virtual clocks is for user space
to directly/easily use them for multiple domains synchronization.
user
space: ^ ^
| SO_TIMESTAMPING new flag: | Packets with
| SOF_TIMESTAMPING_BIND_PHC | TX/RX HW timestamps
v v
+--------------------------------------------+
sock: | sock (new member sk_bind_phc) |
+--------------------------------------------+
^ ^
| ethtool_get_phc_vclocks | Convert HW timestamps
| | to sk_bind_phc
v v
+--------------+--------------+--------------+
vclock: | ptp1 | ptp2 | ptpN |
+--------------+--------------+--------------+
pclock: | ptp0 free running |
+--------------------------------------------+
The block diagram may explain how it works. Besides the PTP virtual
clocks, the packet HW timestamp converting to the bound PHC is also
done in sock driver. For user space, PTP virtual clocks can be
created via sysfs, and extended SO_TIMESTAMPING API (new flag
SOF_TIMESTAMPING_BIND_PHC) can be used to bind one PTP virtual clock
for timestamping.
The test tool timestamping.c (together with linuxptp phc_ctl tool) can
be used to verify:
# echo 4 > /sys/class/ptp/ptp0/n_vclocks
[ 129.399472] ptp ptp0: new virtual clock ptp2
[ 129.404234] ptp ptp0: new virtual clock ptp3
[ 129.409532] ptp ptp0: new virtual clock ptp4
[ 129.413942] ptp ptp0: new virtual clock ptp5
[ 129.418257] ptp ptp0: guarantee physical clock free running
#
# phc_ctl /dev/ptp2 set 10000
# phc_ctl /dev/ptp3 set 20000
#
# timestamping eno0 2 SOF_TIMESTAMPING_TX_HARDWARE SOF_TIMESTAMPING_RAW_HARDWARE SOF_TIMESTAMPING_BIND_PHC
# timestamping eno0 2 SOF_TIMESTAMPING_RX_HARDWARE SOF_TIMESTAMPING_RAW_HARDWARE SOF_TIMESTAMPING_BIND_PHC
# timestamping eno0 3 SOF_TIMESTAMPING_TX_HARDWARE SOF_TIMESTAMPING_RAW_HARDWARE SOF_TIMESTAMPING_BIND_PHC
# timestamping eno0 3 SOF_TIMESTAMPING_RX_HARDWARE SOF_TIMESTAMPING_RAW_HARDWARE SOF_TIMESTAMPING_BIND_PHC
Changes for v2:
- Converted to num_vclocks for creating virtual clocks.
- Guranteed physical clock free running when using virtual
clocks.
- Fixed build warning.
- Updated copyright.
Changes for v3:
- Supported PTP virtual clock in default in PTP driver.
- Protected concurrency of ptp->num_vclocks accessing.
- Supported PHC vclocks query via ethtool.
- Extended SO_TIMESTAMPING API for PHC binding.
- Converted HW timestamps to PHC bound, instead of previous
binding domain value to PHC idea.
- Other minor fixes.
Changes for v4:
- Used do_aux_work callback for vclock refreshing instead.
- Used unsigned int for vclocks number, and max_vclocks
for limitiation.
- Fixed mutex locking.
- Dynamically allocated memory for vclock index storage.
- Removed ethtool ioctl command for vclocks getting.
- Updated doc for ethtool phc vclocks get.
- Converted to mptcp_setsockopt_sol_socket_timestamping().
- Passed so_timestamping for sock_set_timestamping.
- Fixed checkpatch/build.
- Other minor fixed.
Yangbo Lu (11):
ptp: add ptp virtual clock driver framework
ptp: support ptp physical/virtual clocks conversion
ptp: track available ptp vclocks information
ptp: add kernel API ptp_get_vclocks_index()
ethtool: add a new command for getting PHC virtual clocks
ptp: add kernel API ptp_convert_timestamp()
mptcp: setsockopt: convert to
mptcp_setsockopt_sol_socket_timestamping()
net: sock: extend SO_TIMESTAMPING for PHC binding
net: socket: support hardware timestamp conversion to PHC bound
selftests/net: timestamping: support binding PHC
MAINTAINERS: add entry for PTP virtual clock driver
Documentation/ABI/testing/sysfs-ptp | 20 ++
Documentation/networking/ethtool-netlink.rst | 22 ++
MAINTAINERS | 7 +
drivers/ptp/Makefile | 2 +-
drivers/ptp/ptp_clock.c | 41 +++-
drivers/ptp/ptp_private.h | 39 ++++
drivers/ptp/ptp_sysfs.c | 160 ++++++++++++++
drivers/ptp/ptp_vclock.c | 219 +++++++++++++++++++
include/linux/ethtool.h | 10 +
include/linux/ptp_clock_kernel.h | 31 ++-
include/net/sock.h | 8 +-
include/uapi/linux/ethtool_netlink.h | 15 ++
include/uapi/linux/net_tstamp.h | 17 +-
net/core/sock.c | 65 +++++-
net/ethtool/Makefile | 2 +-
net/ethtool/common.c | 14 ++
net/ethtool/netlink.c | 10 +
net/ethtool/netlink.h | 2 +
net/ethtool/phc_vclocks.c | 94 ++++++++
net/mptcp/sockopt.c | 69 ++++--
net/socket.c | 19 +-
tools/testing/selftests/net/timestamping.c | 62 ++++--
22 files changed, 875 insertions(+), 53 deletions(-)
create mode 100644 drivers/ptp/ptp_vclock.c
create mode 100644 net/ethtool/phc_vclocks.c
base-commit: 19938bafa7ae8fc0a4a2c1c1430abb1a04668da1
--
2.25.1
2 years, 11 months
- 5
- 16
[RFC net-next 0/2] Add RTNL interface for SyncE
by Maciej Machnikowski
Synchronous Ethernet networks use a physical layer clock to syntonize
the frequency across different network elements.
Multiple reference clock sources can be used. Clocks recovered from
PHY ports on the RX side or external sources like 1PPS GPS, etc.
This patch series introduces basic interface for reading the DPLL
state on a SyncE capable device. This state gives us information
about the source of the syntonization signal and whether the DPLL
circuit is tuned to the incoming signal.
Next steps:
- add interface to enable recovered clocks and get information
about them
Maciej Machnikowski (2):
rtnetlink: Add new RTM_GETSYNCESTATE message to get SyncE status
ice: add support for reading SyncE DPLL state
drivers/net/ethernet/intel/ice/ice.h | 5 ++
.../net/ethernet/intel/ice/ice_adminq_cmd.h | 34 ++++++++
drivers/net/ethernet/intel/ice/ice_common.c | 62 +++++++++++++++
drivers/net/ethernet/intel/ice/ice_common.h | 4 +
drivers/net/ethernet/intel/ice/ice_devids.h | 3 +
drivers/net/ethernet/intel/ice/ice_main.c | 55 +++++++++++++
drivers/net/ethernet/intel/ice/ice_ptp.c | 35 +++++++++
drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 44 +++++++++++
drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 22 ++++++
include/linux/netdevice.h | 6 ++
include/uapi/linux/if_link.h | 43 +++++++++++
include/uapi/linux/rtnetlink.h | 11 ++-
net/core/rtnetlink.c | 77 +++++++++++++++++++
security/selinux/nlmsgtab.c | 3 +-
14 files changed, 399 insertions(+), 5 deletions(-)
--
2.26.3
2 years, 11 months
- 3
- 4
[PATCH linux-next] tests: remove unneeded conversions to bool
by CGEL
From: Changcheng Deng <deng.changcheng(a)zte.com.cn>
tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c:
225:18-23:WARNING: conversion to bool not needed here
Because the definition of function is
"static int move_mount_set_group_supported(void)",
the return type should be int.
Reported-by: Zeal Robot <zealci(a)zte.com.cn>
Signed-off-by: Changcheng Deng <deng.changcheng(a)zte.com.cn>
---
.../testing/selftests/move_mount_set_group/move_mount_set_group_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
index 860198f..beade21 100644
--- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
+++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
@@ -222,7 +222,7 @@ static int move_mount_set_group_supported(void)
AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
umount2("/tmp", MNT_DETACH);
- return ret < 0 ? false : true;
+ return ret < 0 ? 0 : 1;
}
FIXTURE(move_mount_set_group) {
--
1.8.3.1
2 years, 11 months
- 1
- 0
[PATCH v2 0/5] KVM: rseq: Fix and a test for a KVM+rseq bug
by Sean Christopherson
Patch 1 fixes a KVM+rseq bug where KVM's handling of TIF_NOTIFY_RESUME,
e.g. for task migration, clears the flag without informing rseq and leads
to stale data in userspace's rseq struct.
Patch 2 is a cleanup to try and make future bugs less likely. It's also
a baby step towards moving and renaming tracehook_notify_resume() since
it has nothing to do with tracing.
Patch 3 is a fix/cleanup to stop overriding x86's unistd_{32,64}.h when
the include path (intentionally) omits tools' uapi headers. KVM's
selftests do exactly that so that they can pick up the uapi headers from
the installed kernel headers, and still use various tools/ headers that
mirror kernel code, e.g. linux/types.h. This allows the new test in
patch 4 to reference __NR_rseq without having to manually define it.
Patch 4 is a regression test for the KVM+rseq bug.
Patch 5 is a cleanup made possible by patch 3.
v2:
- Don't touch rseq_cs when handling KVM case so that rseq_syscall() will
still detect a naughty userspace. [Mathieu]
- Use a sequence counter + retry in the test to ensure the process isn't
migrated between sched_getcpu() and reading rseq.cpu_id, i.e. to
avoid a flaky test. [Mathieu]
- Add Mathieu's ack for patch 2.
- Add more comments in the test.
v1: https://lkml.kernel.org/r/20210818001210.4073390-1-seanjc@google.com
Sean Christopherson (5):
KVM: rseq: Update rseq when processing NOTIFY_RESUME on xfer to KVM
guest
entry: rseq: Call rseq_handle_notify_resume() in
tracehook_notify_resume()
tools: Move x86 syscall number fallbacks to .../uapi/
KVM: selftests: Add a test for KVM_RUN+rseq to detect task migration
bugs
KVM: selftests: Remove __NR_userfaultfd syscall fallback
arch/arm/kernel/signal.c | 1 -
arch/arm64/kernel/signal.c | 1 -
arch/csky/kernel/signal.c | 4 +-
arch/mips/kernel/signal.c | 4 +-
arch/powerpc/kernel/signal.c | 4 +-
arch/s390/kernel/signal.c | 1 -
include/linux/tracehook.h | 2 +
kernel/entry/common.c | 4 +-
kernel/rseq.c | 14 +-
.../x86/include/{ => uapi}/asm/unistd_32.h | 0
.../x86/include/{ => uapi}/asm/unistd_64.h | 3 -
tools/testing/selftests/kvm/.gitignore | 1 +
tools/testing/selftests/kvm/Makefile | 3 +
tools/testing/selftests/kvm/rseq_test.c | 154 ++++++++++++++++++
14 files changed, 175 insertions(+), 21 deletions(-)
rename tools/arch/x86/include/{ => uapi}/asm/unistd_32.h (100%)
rename tools/arch/x86/include/{ => uapi}/asm/unistd_64.h (83%)
create mode 100644 tools/testing/selftests/kvm/rseq_test.c
--
2.33.0.rc2.250.ged5fa647cd-goog
2 years, 11 months
- 3
- 15