[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 33/36] iotests: Filter second BLOCK_JOB_ERROR from
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 33/36] iotests: Filter second BLOCK_JOB_ERROR from 229 |
Date: |
Tue, 23 Jul 2019 12:01:01 -0500 |
From: Max Reitz <address@hidden>
Without this filter, this test sometimes fails.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit fff2388d5d9caecca6200455d0ab6d5e13f4e9bd)
Signed-off-by: Michael Roth <address@hidden>
---
tests/qemu-iotests/229 | 6 +++++-
tests/qemu-iotests/229.out | 1 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index 86602437ff..8ce0cd2939 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -82,11 +82,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"
diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out
index 4c4112805f..a3eb33788a 100644
--- a/tests/qemu-iotests/229.out
+++ b/tests/qemu-iotests/229.out
@@ -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
--
2.17.1
- [Qemu-stable] [PATCH 26/36] qemu-img: fix error reporting for -object, (continued)
- [Qemu-stable] [PATCH 26/36] qemu-img: fix error reporting for -object, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 23/36] mac_newworld: use node name instead of alias name for hd device in FWPathProvider, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 30/36] do not call vhost_net_cleanup() on running net from char user event, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 22/36] mac_oldworld: use node name instead of alias name for hd device in FWPathProvider, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 01/36] i2c: Move typedef of bitbang_i2c_interface to i2c.h, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 03/36] Changes requirement for "vsubsbs" instruction, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 02/36] iotests: make 235 work on s390 (and others), Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 06/36] hw/s390x: Fix bad mask in time2tod(), Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 33/36] iotests: Filter second BLOCK_JOB_ERROR from 229,
Michael Roth <=
- [Qemu-stable] [PATCH 05/36] pc:piix4: Update smbus I/O space after a migration, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 31/36] s390x/cpumodel: ignore csske for expansion, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 34/36] block/file-posix: Unaligned O_DIRECT block-status, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 32/36] megasas: fix mapped frame size, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 35/36] iotests: Test unaligned raw images with O_DIRECT, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 36/36] vhost: fix vhost_log size overflow during migration, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 08/36] s390x: Return specification exception for unimplemented diag 308 subcodes, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 04/36] pcie: set link state inactive/active after hot unplug/plug, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 07/36] linux-user: make pwrite64/pread64(fd, NULL, 0, offset) return 0, Michael Roth, 2019/07/23
- Re: [Qemu-stable] [Qemu-devel] [PATCH 00/36] Patch Round-up for stable 3.1.1, freeze on 2019-07-29, Aleksandar Markovic, 2019/07/23