diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-21 11:09:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-21 11:09:13 +0100 |
| commit | 67e8498937866b49b513e3acadef985c15f44fb5 (patch) | |
| tree | 9163f3d11cb93156d4fcfc16bd1f12d978988e41 /tests | |
| parent | ac793156f650ae2d77834932d72224175ee69086 (diff) | |
| parent | 39cf73c3494045b4418c9c1db8e803640e2150dc (diff) | |
| download | qemu-67e8498937866b49b513e3acadef985c15f44fb5.zip qemu-67e8498937866b49b513e3acadef985c15f44fb5.tar.gz qemu-67e8498937866b49b513e3acadef985c15f44fb5.tar.bz2 | |
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging
Pull request
# gpg: Signature made Tue 20 Oct 2020 20:04:54 BST
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jsnow-gitlab/tags/python-pull-request: (21 commits)
python/qemu/qmp.py: Fix settimeout operation
python/qemu/qmp.py: re-raise OSError when encountered
python: add mypy config
python/qemu/qmp.py: Preserve error context on re-raise
python/qemu/console_socket.py: avoid encoding to/from string
python/qemu/console_socket.py: Add type hint annotations
python/qemu/console_socket.py: Clarify type of drain_thread
python/qemu/console_socket.py: fix typing of settimeout
python/qemu/console_socket.py: Correct type of recv()
python/qemu: Add mypy type annotations
iotests.py: Adjust HMP kwargs typing
python/qemu: make 'args' style arguments immutable
python/machine.py: fix _popen access
python/machine.py: Add _qmp access shim
python/machine.py: use qmp.command
python/machine.py: Handle None events in events_wait
python/machine.py: Don't modify state in _base_args()
python/machine.py: reorder __init__
python/machine.py: Fix monitor address typing
python/qemu: use isort to lay out imports
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index f212cec..63d2ace 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -605,7 +605,7 @@ class VM(qtest.QEMUQtestMachine): def hmp(self, command_line: str, use_log: bool = False) -> QMPMessage: cmd = 'human-monitor-command' - kwargs = {'command-line': command_line} + kwargs: Dict[str, Any] = {'command-line': command_line} if use_log: return self.qmp_log(cmd, **kwargs) else: |