iotests: extended timeout under Valgrind
As the iotests run longer under the Valgrind, the QEMU_COMM_TIMEOUT is to be increased in the test cases 028, 183 and 192 when running under the Valgrind. Suggested-by: Roman Kagan <rkagan@virtuozzo.com> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
ad20319a91
commit
fbd1c37838
|
@ -110,7 +110,11 @@ echo
|
|||
qemu_comm_method="monitor"
|
||||
_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk
|
||||
h=$QEMU_HANDLE
|
||||
if [ "${VALGRIND_QEMU}" == "y" ]; then
|
||||
QEMU_COMM_TIMEOUT=7
|
||||
else
|
||||
QEMU_COMM_TIMEOUT=1
|
||||
fi
|
||||
|
||||
# Silence output since it contains the disk image path and QEMU's readline
|
||||
# character echoing makes it very hard to filter the output. Plus, there
|
||||
|
|
|
@ -94,8 +94,15 @@ if echo "$reply" | grep "compiled without old-style" > /dev/null; then
|
|||
_notrun "migrate -b support not compiled in"
|
||||
fi
|
||||
|
||||
QEMU_COMM_TIMEOUT=0.1 qemu_cmd_repeat=50 silent=yes \
|
||||
timeout_comm=$QEMU_COMM_TIMEOUT
|
||||
if [ "${VALGRIND_QEMU}" == "y" ]; then
|
||||
QEMU_COMM_TIMEOUT=4
|
||||
else
|
||||
QEMU_COMM_TIMEOUT=0.1
|
||||
fi
|
||||
qemu_cmd_repeat=50 silent=yes \
|
||||
_send_qemu_cmd $src "{ 'execute': 'query-migrate' }" '"status": "completed"'
|
||||
QEMU_COMM_TIMEOUT=$timeout_comm
|
||||
_send_qemu_cmd $src "{ 'execute': 'query-status' }" "return"
|
||||
|
||||
echo
|
||||
|
|
|
@ -60,7 +60,11 @@ fi
|
|||
qemu_comm_method="monitor"
|
||||
_launch_qemu -drive $DRIVE_ARG -incoming defer
|
||||
h=$QEMU_HANDLE
|
||||
if [ "${VALGRIND_QEMU}" == "y" ]; then
|
||||
QEMU_COMM_TIMEOUT=7
|
||||
else
|
||||
QEMU_COMM_TIMEOUT=1
|
||||
fi
|
||||
|
||||
_send_qemu_cmd $h "nbd_server_start unix:$TEST_DIR/nbd" "(qemu)"
|
||||
_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)"
|
||||
|
|
Loading…
Reference in a new issue