From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"open list:Block layer core" <qemu-block@nongnu.org>,
Max Reitz <mreitz@redhat.com>
Subject: [PULL 12/13] iotests.py: fix qemu_tool_pipe_and_status()
Date: Wed, 20 Jan 2021 20:36:56 -0600 [thread overview]
Message-ID: <20210121023657.1186241-13-eblake@redhat.com> (raw)
In-Reply-To: <20210121023657.1186241-1-eblake@redhat.com>
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
next prev parent reply other threads:[~2021-01-21 2:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 2:36 [PULL 00/13] NBD patches through 2021-01-20 Eric Blake
2021-01-21 2:36 ` [PULL 01/13] qemu-nbd: Fix a memleak in qemu_nbd_client_list() Eric Blake
2021-01-21 2:36 ` [PULL 02/13] qemu-nbd: Fix a memleak in nbd_client_thread() Eric Blake
2021-01-21 2:36 ` [PULL 03/13] block: Honor blk_set_aio_context() context requirements Eric Blake
2021-01-21 2:36 ` [PULL 04/13] nbd/server: Quiesce coroutines on context switch Eric Blake
2021-01-21 2:36 ` [PULL 05/13] iotests/277: use dot slash for nbd-fault-injector.py running Eric Blake
2021-01-21 2:36 ` [PULL 06/13] iotests/303: use dot slash for qcow2.py running Eric Blake
2021-01-21 2:36 ` [PULL 07/13] iotests: fix some whitespaces in test output files Eric Blake
2021-01-21 2:36 ` [PULL 08/13] iotests: make tests executable Eric Blake
2021-01-21 2:36 ` [PULL 09/13] iotests/294: add shebang line Eric Blake
2021-01-21 2:36 ` [PULL 10/13] iotests: define group in each iotest Eric Blake
2021-01-21 9:19 ` Vladimir Sementsov-Ogievskiy
2021-01-21 2:36 ` [PULL 11/13] iotests/264: fix style Eric Blake
2021-01-21 2:36 ` Eric Blake [this message]
2021-01-21 2:36 ` [PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status() Eric Blake
2021-01-21 11:35 ` [PULL 00/13] NBD patches through 2021-01-20 Peter Maydell
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=20210121023657.1186241-13-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).