From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
philmd@redhat.com
Subject: [PATCH v2 02/16] iotests.py: use qemu.qmp type aliases
Date: Tue, 2 Jun 2020 17:45:14 -0400 [thread overview]
Message-ID: <20200602214528.12107-3-jsnow@redhat.com> (raw)
In-Reply-To: <20200602214528.12107-1-jsnow@redhat.com>
iotests.py should use the type definitions from qmp.py instead of its
own.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/iotests.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index f20d90f9698..7c1773bba37 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -35,13 +35,10 @@
# pylint: disable=import-error, wrong-import-position
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
from qemu import qtest
+from qemu.qmp import QMPMessage
assert sys.version_info >= (3, 6)
-# Type Aliases
-QMPResponse = Dict[str, Any]
-
-
# Use this logger for logging messages directly from the iotests module
logger = logging.getLogger('qemu.iotests')
logger.addHandler(logging.NullHandler())
@@ -554,7 +551,7 @@ def add_incoming(self, addr):
self._args.append(addr)
return self
- def hmp(self, command_line: str, use_log: bool = False) -> QMPResponse:
+ def hmp(self, command_line: str, use_log: bool = False) -> QMPMessage:
cmd = 'human-monitor-command'
kwargs = {'command-line': command_line}
if use_log:
@@ -575,7 +572,7 @@ def resume_drive(self, drive: str) -> None:
self.hmp(f'qemu-io {drive} "remove_break bp_{drive}"')
def hmp_qemu_io(self, drive: str, cmd: str,
- use_log: bool = False) -> QMPResponse:
+ use_log: bool = False) -> QMPMessage:
"""Write to a given drive using an HMP command"""
return self.hmp(f'qemu-io {drive} "{cmd}"', use_log=use_log)
--
2.21.3
next prev parent reply other threads:[~2020-06-02 21:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 21:45 [PATCH v2 00/16] python: add mypy support to python/qemu John Snow
2020-06-02 21:45 ` [PATCH v2 01/16] python/qmp.py: Define common types John Snow
2020-06-02 21:45 ` John Snow [this message]
2020-06-02 21:45 ` [PATCH v2 03/16] python/qmp.py: re-absorb MonitorResponseError John Snow
2020-06-02 21:45 ` [PATCH v2 04/16] python/qmp.py: Do not return None from cmd_obj John Snow
2020-06-02 21:45 ` [PATCH v2 05/16] python/qmp.py: add casts to JSON deserialization John Snow
2020-06-04 13:49 ` Kevin Wolf
2020-06-04 18:33 ` John Snow
2020-06-02 21:45 ` [PATCH v2 06/16] python/qmp.py: add QMPProtocolError John Snow
2020-06-02 21:45 ` [PATCH v2 07/16] python/machine.py: Fix monitor address typing John Snow
2020-06-02 21:45 ` [PATCH v2 08/16] python/machine.py: reorder __init__ John Snow
2020-06-02 21:45 ` [PATCH v2 09/16] python/machine.py: Don't modify state in _base_args() John Snow
2020-06-02 21:45 ` [PATCH v2 10/16] python/machine.py: Handle None events in event_wait John Snow
2020-06-04 14:20 ` Kevin Wolf
2020-06-04 18:48 ` John Snow
2020-06-02 21:45 ` [PATCH v2 11/16] python/machine.py: use qmp.command John Snow
2020-06-02 21:45 ` [PATCH v2 12/16] python/machine.py: Add _qmp access shim John Snow
2020-06-02 21:45 ` [PATCH v2 13/16] python/machine.py: fix _popen access John Snow
2020-06-02 21:45 ` [PATCH v2 14/16] python/qemu: make 'args' style arguments immutable John Snow
2020-06-02 21:45 ` [PATCH v2 15/16] iotests.py: Adjust HMP kwargs typing John Snow
2020-06-02 21:45 ` [PATCH v2 16/16] python/qemu: Add mypy type annotations John Snow
2020-06-04 14:50 ` Kevin Wolf
2020-06-04 18:53 ` John Snow
2020-06-02 21:51 ` [PATCH v2 00/16] python: add mypy support to python/qemu Eric Blake
2020-06-02 22:31 ` John Snow
2020-06-03 8:24 ` Vladimir Sementsov-Ogievskiy
2020-06-03 14:15 ` John Snow
2020-06-04 14:51 ` Kevin Wolf
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=20200602214528.12107-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).