From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4Vbl-0004ws-Gt for qemu-devel@nongnu.org; Wed, 09 Nov 2016 11:20:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4Vbk-0005ae-Nq for qemu-devel@nongnu.org; Wed, 09 Nov 2016 11:20:17 -0500 From: Paolo Bonzini Date: Wed, 9 Nov 2016 17:20:07 +0100 Message-Id: <20161109162008.27287-1-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8] qemu-iotests: avoid spurious failure on test 109 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, jsnow@redhat.com, jcody@redhat.com In some cases it is possible that query-io-status is called just before the job is completed, causing -{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 31457280, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} -{"return": []} +{"return": [{"io-status": "ok", "device": "src", "busy": true, "len": 31457280, "offset": OFFSET, "paused": false, "speed": 0, "ready": false, "type": "mirror"}]} Assert that the completeion event eventually happens. Signed-off-by: Paolo Bonzini --- tests/qemu-iotests/109 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index 280ed27..927151a 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -62,6 +62,9 @@ function run_qemu() "return" _send_qemu_cmd $QEMU_HANDLE '' "$qmp_event" + if test "$qmp_event" = BLOCK_JOB_ERROR; then + _send_qemu_cmd $QEMU_HANDLE '' "BLOCK_JOB_COMPLETED" + fi _send_qemu_cmd $QEMU_HANDLE '{"execute":"query-block-jobs"}' "return" _cleanup_qemu } -- 2.9.3