[v2,2/3] kunit: tool: remove unused imports and variables
Commit Message
We don't run a linter regularly over kunit.py code (the default settings
on most don't like kernel style, e.g. tabs) so some of these imports
didn't get removed when they stopped being used.
Signed-off-by: Daniel Latypov <dlatypov@google.com>
---
Note: this is unchanged, just added a 3rd patch to this series.
---
tools/testing/kunit/kunit.py | 2 +-
tools/testing/kunit/kunit_config.py | 2 +-
tools/testing/kunit/kunit_kernel.py | 1 -
tools/testing/kunit/kunit_parser.py | 1 -
tools/testing/kunit/kunit_tool_test.py | 2 +-
5 files changed, 3 insertions(+), 5 deletions(-)
Comments
On Fri, 17 Mar 2023 at 06:06, Daniel Latypov <dlatypov@google.com> wrote:
>
> We don't run a linter regularly over kunit.py code (the default settings
> on most don't like kernel style, e.g. tabs) so some of these imports
> didn't get removed when they stopped being used.
>
> Signed-off-by: Daniel Latypov <dlatypov@google.com>
> ---
While personally, I don't lose sleep over the occasional unused
variable, these (and particularly the imports) seem sensible.
Reviewed-by: David Gow <davidgow@google.com>
Cheers,
-- David
> Note: this is unchanged, just added a 3rd patch to this series.
> ---
> tools/testing/kunit/kunit.py | 2 +-
> tools/testing/kunit/kunit_config.py | 2 +-
> tools/testing/kunit/kunit_kernel.py | 1 -
> tools/testing/kunit/kunit_parser.py | 1 -
> tools/testing/kunit/kunit_tool_test.py | 2 +-
> 5 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
> index 741f15420467..52853634ba23 100755
> --- a/tools/testing/kunit/kunit.py
> +++ b/tools/testing/kunit/kunit.py
> @@ -123,7 +123,7 @@ def _suites_from_test_list(tests: List[str]) -> List[str]:
> parts = t.split('.', maxsplit=2)
> if len(parts) != 2:
> raise ValueError(f'internal KUnit error, test name should be of the form "<suite>.<test>", got "{t}"')
> - suite, case = parts
> + suite, _ = parts
> if not suites or suites[-1] != suite:
> suites.append(suite)
> return suites
> diff --git a/tools/testing/kunit/kunit_config.py b/tools/testing/kunit/kunit_config.py
> index 48b5f34b2e5d..9f76d7b89617 100644
> --- a/tools/testing/kunit/kunit_config.py
> +++ b/tools/testing/kunit/kunit_config.py
> @@ -8,7 +8,7 @@
>
> from dataclasses import dataclass
> import re
> -from typing import Dict, Iterable, List, Set, Tuple
> +from typing import Dict, Iterable, List, Tuple
>
> CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
> CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'
> diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
> index e6fc8fcb071a..775842b912d8 100644
> --- a/tools/testing/kunit/kunit_kernel.py
> +++ b/tools/testing/kunit/kunit_kernel.py
> @@ -18,7 +18,6 @@ import threading
> from typing import Iterator, List, Optional, Tuple
>
> import kunit_config
> -from kunit_printer import stdout
> import qemu_config
>
> KCONFIG_PATH = '.config'
> diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py
> index a225799f6b1b..fbc094f0567e 100644
> --- a/tools/testing/kunit/kunit_parser.py
> +++ b/tools/testing/kunit/kunit_parser.py
> @@ -12,7 +12,6 @@
> from __future__ import annotations
> from dataclasses import dataclass
> import re
> -import sys
> import textwrap
>
> from enum import Enum, auto
> diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py
> index 0c2190514103..be35999bb84f 100755
> --- a/tools/testing/kunit/kunit_tool_test.py
> +++ b/tools/testing/kunit/kunit_tool_test.py
> @@ -328,7 +328,7 @@ class KUnitParserTest(unittest.TestCase):
> def test_parse_subtest_header(self):
> ktap_log = test_data_path('test_parse_subtest_header.log')
> with open(ktap_log) as file:
> - result = kunit_parser.parse_run_tests(file.readlines())
> + kunit_parser.parse_run_tests(file.readlines())
> self.print_mock.assert_any_call(StrContains('suite (1 subtest)'))
>
> def test_show_test_output_on_failure(self):
> --
> 2.40.0.rc1.284.g88254d51c5-goog
>
@@ -123,7 +123,7 @@ def _suites_from_test_list(tests: List[str]) -> List[str]:
parts = t.split('.', maxsplit=2)
if len(parts) != 2:
raise ValueError(f'internal KUnit error, test name should be of the form "<suite>.<test>", got "{t}"')
- suite, case = parts
+ suite, _ = parts
if not suites or suites[-1] != suite:
suites.append(suite)
return suites
@@ -8,7 +8,7 @@
from dataclasses import dataclass
import re
-from typing import Dict, Iterable, List, Set, Tuple
+from typing import Dict, Iterable, List, Tuple
CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'
@@ -18,7 +18,6 @@ import threading
from typing import Iterator, List, Optional, Tuple
import kunit_config
-from kunit_printer import stdout
import qemu_config
KCONFIG_PATH = '.config'
@@ -12,7 +12,6 @@
from __future__ import annotations
from dataclasses import dataclass
import re
-import sys
import textwrap
from enum import Enum, auto
@@ -328,7 +328,7 @@ class KUnitParserTest(unittest.TestCase):
def test_parse_subtest_header(self):
ktap_log = test_data_path('test_parse_subtest_header.log')
with open(ktap_log) as file:
- result = kunit_parser.parse_run_tests(file.readlines())
+ kunit_parser.parse_run_tests(file.readlines())
self.print_mock.assert_any_call(StrContains('suite (1 subtest)'))
def test_show_test_output_on_failure(self):