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 3/4] iotests: Fix run_job() with use_log=False
Date: Thu, 5 Mar 2020 13:50:59 +0100 [thread overview]
Message-ID: <20200305125100.386-4-kwolf@redhat.com> (raw)
In-Reply-To: <20200305125100.386-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-05 12:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 12:50 [PATCH 0/4] block: Relax restrictions for blockdev-snapshot Kevin Wolf
2020-03-05 12:50 ` [PATCH 1/4] block: Make bdrv_get_cumulative_perm() public Kevin Wolf
2020-03-05 12:50 ` [PATCH 2/4] block: Relax restrictions for blockdev-snapshot Kevin Wolf
2020-03-05 12:50 ` Kevin Wolf [this message]
2020-03-05 12:51 ` [PATCH 4/4] iotests: Test mirror with temporarily disabled target backing file Kevin Wolf
2020-03-05 13:33 ` [PATCH 0/4] block: Relax restrictions for blockdev-snapshot no-reply
2020-03-05 13:40 ` no-reply
2020-03-05 14:24 ` Peter Krempa
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=20200305125100.386-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).