| Message ID | 1563553816-148827-6-git-send-email-andrey.shinkevich@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Allow Valgrind checking all QEMU processes | expand |
On 7/19/19 12:30 PM, Andrey Shinkevich wrote: > 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> > --- > tests/qemu-iotests/028 | 6 +++++- > tests/qemu-iotests/183 | 9 ++++++++- > tests/qemu-iotests/192 | 6 +++++- > 3 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 > index 01f4959..71301ec 100755 > --- a/tests/qemu-iotests/028 > +++ b/tests/qemu-iotests/028 > @@ -110,7 +110,11 @@ echo > qemu_comm_method="monitor" > _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk > h=$QEMU_HANDLE > -QEMU_COMM_TIMEOUT=1 > +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 > diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 > index fbe5a99..04fb344 100755 > --- a/tests/qemu-iotests/183 > +++ b/tests/qemu-iotests/183 > @@ -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 > diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 > index 6193257..0344322 100755 > --- a/tests/qemu-iotests/192 > +++ b/tests/qemu-iotests/192 > @@ -60,7 +60,11 @@ fi > qemu_comm_method="monitor" > _launch_qemu -drive $DRIVE_ARG -incoming defer > h=$QEMU_HANDLE > -QEMU_COMM_TIMEOUT=1 > +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)" > I guess we're adding some more magic numbers to join the magic numbers we already have. Ah, well, perfection is a good way to make sure nothing good ever happens: Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 01f4959..71301ec 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -110,7 +110,11 @@ echo qemu_comm_method="monitor" _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk h=$QEMU_HANDLE -QEMU_COMM_TIMEOUT=1 +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 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index fbe5a99..04fb344 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -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 diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 6193257..0344322 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -60,7 +60,11 @@ fi qemu_comm_method="monitor" _launch_qemu -drive $DRIVE_ARG -incoming defer h=$QEMU_HANDLE -QEMU_COMM_TIMEOUT=1 +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)"