[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/13] iotests.py: fix qemu_tool_pipe_and_status()
From: |
Eric Blake |
Subject: |
[PULL 12/13] iotests.py: fix qemu_tool_pipe_and_status() |
Date: |
Wed, 20 Jan 2021 20:36:56 -0600 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
qemu_img_args variable is unrelated here. We should print just args.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201130134024.19212-4-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/qemu-iotests/iotests.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index dcdcd0387f20..ea5c3c51624e 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -101,9 +101,8 @@ def qemu_tool_pipe_and_status(tool: str, args:
Sequence[str],
universal_newlines=True)
output = subp.communicate()[0]
if subp.returncode < 0:
- sys.stderr.write('%s received signal %i: %s\n'
- % (tool, -subp.returncode,
- ' '.join(qemu_img_args + list(args))))
+ cmd = ' '.join(args)
+ sys.stderr.write(f'{tool} received signal {-subp.returncode}: {cmd}\n')
return (output, subp.returncode)
def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]:
--
2.30.0
- [PULL 05/13] iotests/277: use dot slash for nbd-fault-injector.py running, (continued)
- [PULL 05/13] iotests/277: use dot slash for nbd-fault-injector.py running, Eric Blake, 2021/01/20
- [PULL 03/13] block: Honor blk_set_aio_context() context requirements, Eric Blake, 2021/01/20
- [PULL 07/13] iotests: fix some whitespaces in test output files, Eric Blake, 2021/01/20
- [PULL 08/13] iotests: make tests executable, Eric Blake, 2021/01/20
- [PULL 10/13] iotests: define group in each iotest, Eric Blake, 2021/01/20
- [PULL 11/13] iotests/264: fix style, Eric Blake, 2021/01/20
- [PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status(), Eric Blake, 2021/01/20
- [PULL 06/13] iotests/303: use dot slash for qcow2.py running, Eric Blake, 2021/01/20
- [PULL 09/13] iotests/294: add shebang line, Eric Blake, 2021/01/20
- [PULL 12/13] iotests.py: fix qemu_tool_pipe_and_status(),
Eric Blake <=
- Re: [PULL 00/13] NBD patches through 2021-01-20, Peter Maydell, 2021/01/21