From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org,
mreitz@redhat.com
Subject: [PATCH v2 3/7] iotests: Fix run_job() with use_log=False
Date: Tue, 10 Mar 2020 12:38:27 +0100 [thread overview]
Message-ID: <20200310113831.27293-4-kwolf@redhat.com> (raw)
In-Reply-To: <20200310113831.27293-1-kwolf@redhat.com>
The 'job-complete' QMP command should be run with qmp() rather than
qmp_log() if use_log=False is passed.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/iotests.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 8815052eb5..23043baa26 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -624,7 +624,10 @@ class VM(qtest.QEMUQtestMachine):
if use_log:
log('Job failed: %s' % (j['error']))
elif status == 'ready':
- self.qmp_log('job-complete', id=job)
+ if use_log:
+ self.qmp_log('job-complete', id=job)
+ else:
+ self.qmp('job-complete', id=job)
elif status == 'pending' and not auto_finalize:
if pre_finalize:
pre_finalize()
--
2.20.1
next prev parent reply other threads:[~2020-03-10 11:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 11:38 [PATCH v2 0/7] block: Relax restrictions for blockdev-snapshot Kevin Wolf
2020-03-10 11:38 ` [PATCH v2 1/7] block: Make bdrv_get_cumulative_perm() public Kevin Wolf
2020-03-10 13:10 ` Peter Krempa
2020-03-10 11:38 ` [PATCH v2 2/7] block: Relax restrictions for blockdev-snapshot Kevin Wolf
2020-03-10 13:15 ` Peter Krempa
2020-03-10 13:27 ` Kevin Wolf
2020-03-10 11:38 ` Kevin Wolf [this message]
2020-03-10 13:16 ` [PATCH v2 3/7] iotests: Fix run_job() with use_log=False Peter Krempa
2020-03-10 11:38 ` [PATCH v2 4/7] iotests: Test mirror with temporarily disabled target backing file Kevin Wolf
2020-03-10 13:25 ` Peter Krempa
2020-03-10 11:38 ` [PATCH v2 5/7] block: Fix cross-AioContext blockdev-snapshot Kevin Wolf
2020-03-10 13:27 ` Peter Krempa
2020-03-10 11:38 ` [PATCH v2 6/7] iotests: Add iothread cases to 155 Kevin Wolf
2020-03-10 13:28 ` Peter Krempa
2020-03-10 11:38 ` [PATCH v2 7/7] qapi: Add '@allow-write-only-overlay' feature for 'blockdev-snapshot' Kevin Wolf
2020-03-10 17:43 ` [PATCH v2 0/7] block: Relax restrictions for blockdev-snapshot 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=20200310113831.27293-4-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pkrempa@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).