[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/13] iotests: Fix run_job() with use_log=False
From: |
Kevin Wolf |
Subject: |
[PULL 04/13] iotests: Fix run_job() with use_log=False |
Date: |
Wed, 11 Mar 2020 16:42:09 +0100 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Krempa <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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
- [PULL 00/13] Block layer patches, Kevin Wolf, 2020/03/11
- [PULL 01/13] qom-qmp-cmds: fix two memleaks in qmp_object_add, Kevin Wolf, 2020/03/11
- [PULL 03/13] block: Relax restrictions for blockdev-snapshot, Kevin Wolf, 2020/03/11
- [PULL 04/13] iotests: Fix run_job() with use_log=False,
Kevin Wolf <=
- [PULL 05/13] iotests: Test mirror with temporarily disabled target backing file, Kevin Wolf, 2020/03/11
- [PULL 06/13] block: Fix cross-AioContext blockdev-snapshot, Kevin Wolf, 2020/03/11
- [PULL 07/13] iotests: Add iothread cases to 155, Kevin Wolf, 2020/03/11
- [PULL 02/13] block: Make bdrv_get_cumulative_perm() public, Kevin Wolf, 2020/03/11
- [PULL 08/13] qapi: Add '@allow-write-only-overlay' feature for 'blockdev-snapshot', Kevin Wolf, 2020/03/11
- [PULL 09/13] tests/qemu-iotests: Fix socket_scm_helper build path, Kevin Wolf, 2020/03/11
- [PULL 11/13] block.c: adding bdrv_co_delete_file, Kevin Wolf, 2020/03/11
- [PULL 12/13] crypto.c: cleanup created file when block_crypto_co_create_opts_luks fails, Kevin Wolf, 2020/03/11
- [PULL 10/13] block: introducing 'bdrv_co_delete_file' interface, Kevin Wolf, 2020/03/11
- [PULL 13/13] qemu-iotests: adding LUKS cleanup for non-UTF8 secret error, Kevin Wolf, 2020/03/11