From: Daniel Latypov <dlatypov@google.com>
To: brendanhiggins@google.com, davidgow@google.com
Cc: linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com,
linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org,
Daniel Latypov <dlatypov@google.com>
Subject: [PATCH 4/5] kunit: tool: drop last uses of collections.namedtuple
Date: Tue, 18 Jan 2022 11:09:21 -0800 [thread overview]
Message-ID: <20220118190922.1557074-4-dlatypov@google.com> (raw)
In-Reply-To: <20220118190922.1557074-1-dlatypov@google.com>
Since we formally require python3.7+ since commit df4b0807ca1a
("kunit: tool: Assert the version requirement"), we can just use
@dataclasses.dataclass instead.
In kunit_config.py, we used namedtuple to create a hashable type that
had `name` and `value` fields and had to subclass it to define a custom
`__str__()`.
@datalcass lets us just define one type instead.
In qemu_config.py, we use namedtuple to allow modules to define various
parameters. Using @dataclass, we can add type-annotations for all these
fields, making our code more typesafe and making it easier for users to
figure out how to define new configs.
Signed-off-by: Daniel Latypov <dlatypov@google.com>
---
tools/testing/kunit/kunit_config.py | 9 +++++----
tools/testing/kunit/qemu_config.py | 17 ++++++++++-------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/tools/testing/kunit/kunit_config.py b/tools/testing/kunit/kunit_config.py
index 677354546156..ca33e4b7bcc5 100644
--- a/tools/testing/kunit/kunit_config.py
+++ b/tools/testing/kunit/kunit_config.py
@@ -6,16 +6,17 @@
# Author: Felix Guo <felixguoxiuping@gmail.com>
# Author: Brendan Higgins <brendanhiggins@google.com>
-import collections
+from dataclasses import dataclass
import re
from typing import List, Set
CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'
-KconfigEntryBase = collections.namedtuple('KconfigEntryBase', ['name', 'value'])
-
-class KconfigEntry(KconfigEntryBase):
+@dataclass(frozen=True)
+class KconfigEntry:
+ name: str
+ value: str
def __str__(self) -> str:
if self.value == 'n':
diff --git a/tools/testing/kunit/qemu_config.py b/tools/testing/kunit/qemu_config.py
index 1672f6184e95..0b6a80398ccc 100644
--- a/tools/testing/kunit/qemu_config.py
+++ b/tools/testing/kunit/qemu_config.py
@@ -5,12 +5,15 @@
# Copyright (C) 2021, Google LLC.
# Author: Brendan Higgins <brendanhiggins@google.com>
-from collections import namedtuple
+from dataclasses import dataclass
+from typing import List
-QemuArchParams = namedtuple('QemuArchParams', ['linux_arch',
- 'kconfig',
- 'qemu_arch',
- 'kernel_path',
- 'kernel_command_line',
- 'extra_qemu_params'])
+@dataclass(frozen=True)
+class QemuArchParams:
+ linux_arch: str
+ kconfig: str
+ qemu_arch: str
+ kernel_path: str
+ kernel_command_line: str
+ extra_qemu_params: List[str]
--
2.34.1.703.g22d0c6ccf7-goog
next prev parent reply other threads:[~2022-01-18 19:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 19:09 [PATCH 1/5] kunit: tool: drop mostly unused KunitResult.result field Daniel Latypov
2022-01-18 19:09 ` [PATCH 2/5] kunit: tool: make --json handling a bit clearer Daniel Latypov
2022-01-20 8:29 ` David Gow
2022-03-23 20:44 ` Brendan Higgins
2022-01-18 19:09 ` [PATCH 3/5] kunit: tool: drop unused KernelDirectoryPath var Daniel Latypov
2022-01-20 8:29 ` David Gow
2022-03-23 20:46 ` Brendan Higgins
2022-01-18 19:09 ` Daniel Latypov [this message]
2022-01-20 8:29 ` [PATCH 4/5] kunit: tool: drop last uses of collections.namedtuple David Gow
2022-03-23 20:52 ` Brendan Higgins
2022-01-18 19:09 ` [PATCH 5/5] kunit: tool: simplify code since build_dir can't be None Daniel Latypov
2022-01-20 8:30 ` David Gow
2022-03-23 21:04 ` Brendan Higgins
2022-01-20 8:29 ` [PATCH 1/5] kunit: tool: drop mostly unused KunitResult.result field David Gow
2022-01-20 17:19 ` Daniel Latypov
2022-01-26 19:55 ` Daniel Latypov
2022-01-26 21:38 ` Brendan Higgins
2022-01-27 2:20 ` David Gow
2022-01-27 17:58 ` Daniel Latypov
2022-01-26 21:40 ` Brendan Higgins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220118190922.1557074-4-dlatypov@google.com \
--to=dlatypov@google.com \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome