[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 7/7] qemu-iotests: fix 185
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 7/7] qemu-iotests: fix 185 |
Date: |
Fri, 11 Aug 2017 16:05:36 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
185 can sometimes produce wrong output like this:
185 2s ... - output mismatch (see 185.out.bad)
--- /work/src/qemu/master/tests/qemu-iotests/185.out 2017-07-14 \
15:14:29.520343805 +0300
+++ 185.out.bad 2017-08-07 16:51:02.231922900 +0300
@@ -37,7 +37,7 @@
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, \
"event": "SHUTDOWN", "data": {"guest": false}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, \
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", \
"len": 4194304, "offset": 4194304, "speed": 65536, "type": \
"mirror"}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, \
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", \
"len": 0, "offset": 0, "speed": 65536, "type": "mirror"}}
=== Start backup job and exit qemu ===
Failures: 185
Failed 1 of 1 tests
This is because, under heavy load, the quit can happen before the first
iteration of the mirror request has occurred. To make sure we've had
time to iterate, let's just add a sleep for 0.5 seconds before quitting.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/185 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index 0eda371f27..f5b47e4c1a 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185
@@ -156,6 +156,10 @@ _send_qemu_cmd $h \
'speed': 65536 } }" \
"return"
+# If we don't sleep here 'quit' command may be handled before
+# the first mirror iteration is done
+sleep 0.5
+
_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"
wait=1 _cleanup_qemu
--
2.13.4
- [Qemu-block] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 1/7] tests/multiboot: Fix whitespace failure, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 2/7] vpc: Check failure of bdrv_getlength(), Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 4/7] qcow2: Check failure of bdrv_getlength(), Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 5/7] osdep: Add runtime OFD lock detection, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 3/7] qcow2: Drop debugging dump_refcounts(), Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 6/7] file-posix: Do runtime check for ofd lock API, Kevin Wolf, 2017/08/11
- [Qemu-block] [PULL 7/7] qemu-iotests: fix 185,
Kevin Wolf <=
- Re: [Qemu-block] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3, Peter Maydell, 2017/08/11