diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-11-09 17:20:07 +0100 |
---|---|---|
committer | Jeff Cody <jcody@redhat.com> | 2016-11-14 22:47:34 -0500 |
commit | 0a4c0c3f90c3fb0239cb17d63a68c14742965a1c (patch) | |
tree | 10dad205c7f17f831b138a641ef7e13cce5ad4b9 | |
parent | 0aef09b9c916e8824cabc55a7fd2ca1609b94810 (diff) | |
download | qemu-0a4c0c3f90c3fb0239cb17d63a68c14742965a1c.zip qemu-0a4c0c3f90c3fb0239cb17d63a68c14742965a1c.tar.gz qemu-0a4c0c3f90c3fb0239cb17d63a68c14742965a1c.tar.bz2 |
qemu-iotests: avoid spurious failure on test 109
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 <pbonzini@redhat.com>
Message-id: 20161109162008.27287-1-pbonzini@redhat.com
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
-rwxr-xr-x | tests/qemu-iotests/109 | 3 |
1 files changed, 3 insertions, 0 deletions
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 } |