iotests: Filter second BLOCK_JOB_ERROR from 229
Without this filter, this test sometimes fails. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
eb97813ff5
commit
fff2388d5d
|
@ -81,11 +81,15 @@ echo
|
|||
echo '=== Force cancel job paused in error state ==='
|
||||
echo
|
||||
|
||||
# Filter out BLOCK_JOB_ERROR events because they may or may not occur.
|
||||
# Cancelling the job means resuming it for a bit before it is actually
|
||||
# aborted, and in that time it may or may not re-encounter the error.
|
||||
success_or_failure="y" _send_qemu_cmd $QEMU_HANDLE \
|
||||
"{'execute': 'block-job-cancel',
|
||||
'arguments': { 'device': 'testdisk',
|
||||
'force': true}}" \
|
||||
"BLOCK_JOB_CANCELLED" "Assertion"
|
||||
"BLOCK_JOB_CANCELLED" "Assertion" \
|
||||
| grep -v '"BLOCK_JOB_ERROR"'
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
|
|
|
@ -17,7 +17,6 @@ wrote 2097152/2097152 bytes at offset 0
|
|||
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "testdisk", "operation": "write", "action": "stop"}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "testdisk"}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len": 2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
|
||||
*** done
|
||||
|
|
Loading…
Reference in a new issue