aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/229
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2019-01-31 00:52:51 +0100
committerKevin Wolf <kwolf@redhat.com>2019-02-01 13:46:45 +0100
commitfff2388d5d9caecca6200455d0ab6d5e13f4e9bd (patch)
tree5c1d30d6753c22847dd832a91fbb500a54868571 /tests/qemu-iotests/229
parenteb97813ff5fd5bdffc8ed9f5be5a3a50eae70a2c (diff)
downloadqemu-fff2388d5d9caecca6200455d0ab6d5e13f4e9bd.zip
qemu-fff2388d5d9caecca6200455d0ab6d5e13f4e9bd.tar.gz
qemu-fff2388d5d9caecca6200455d0ab6d5e13f4e9bd.tar.bz2
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>
Diffstat (limited to 'tests/qemu-iotests/229')
-rwxr-xr-xtests/qemu-iotests/2296
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index 893d098..b0d4885 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -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"