From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"open list:Block layer core" <qemu-block@nongnu.org>,
Max Reitz <mreitz@redhat.com>
Subject: [PULL 11/13] iotests/264: fix style
Date: Wed, 20 Jan 2021 20:36:55 -0600 [thread overview]
Message-ID: <20210121023657.1186241-12-eblake@redhat.com> (raw)
In-Reply-To: <20210121023657.1186241-1-eblake@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Fix long line, extra import and one mypy complaint about incompatible
int and float.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201118180433.11931-7-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/qemu-iotests/264 | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264
index 960f0449a4e4..e725cefd47b5 100755
--- a/tests/qemu-iotests/264
+++ b/tests/qemu-iotests/264
@@ -22,8 +22,7 @@
import time
import iotests
-from iotests import qemu_img_create, qemu_io_silent_check, file_path, \
- qemu_nbd_popen, log
+from iotests import qemu_img_create, file_path, qemu_nbd_popen, log
iotests.script_initialize(
supported_fmts=['qcow2'],
@@ -32,7 +31,7 @@ iotests.script_initialize(
disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock')
nbd_uri = 'nbd+unix:///?socket=' + nbd_sock
size = 5 * 1024 * 1024
-wait_limit = 3
+wait_limit = 3.0
wait_step = 0.2
qemu_img_create('-f', iotests.imgfmt, disk_a, str(size))
@@ -49,11 +48,11 @@ with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b):
'file': {'driver': 'nbd',
'server': {'type': 'unix', 'path': nbd_sock},
'reconnect-delay': 10}})
- vm.qmp_log('blockdev-backup', device='drive0', sync='full', target='backup0',
- speed=(1 * 1024 * 1024))
+ vm.qmp_log('blockdev-backup', device='drive0', sync='full',
+ target='backup0', speed=(1 * 1024 * 1024))
# Wait for some progress
- t = 0
+ t = 0.0
while t < wait_limit:
jobs = vm.qmp('query-block-jobs')['return']
if jobs and jobs[0]['offset'] > 0:
--
2.30.0
next prev parent reply other threads:[~2021-01-21 2:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 2:36 [PULL 00/13] NBD patches through 2021-01-20 Eric Blake
2021-01-21 2:36 ` [PULL 01/13] qemu-nbd: Fix a memleak in qemu_nbd_client_list() Eric Blake
2021-01-21 2:36 ` [PULL 02/13] qemu-nbd: Fix a memleak in nbd_client_thread() Eric Blake
2021-01-21 2:36 ` [PULL 03/13] block: Honor blk_set_aio_context() context requirements Eric Blake
2021-01-21 2:36 ` [PULL 04/13] nbd/server: Quiesce coroutines on context switch Eric Blake
2021-01-21 2:36 ` [PULL 05/13] iotests/277: use dot slash for nbd-fault-injector.py running Eric Blake
2021-01-21 2:36 ` [PULL 06/13] iotests/303: use dot slash for qcow2.py running Eric Blake
2021-01-21 2:36 ` [PULL 07/13] iotests: fix some whitespaces in test output files Eric Blake
2021-01-21 2:36 ` [PULL 08/13] iotests: make tests executable Eric Blake
2021-01-21 2:36 ` [PULL 09/13] iotests/294: add shebang line Eric Blake
2021-01-21 2:36 ` [PULL 10/13] iotests: define group in each iotest Eric Blake
2021-01-21 9:19 ` Vladimir Sementsov-Ogievskiy
2021-01-21 2:36 ` Eric Blake [this message]
2021-01-21 2:36 ` [PULL 12/13] iotests.py: fix qemu_tool_pipe_and_status() Eric Blake
2021-01-21 2:36 ` [PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status() Eric Blake
2021-01-21 11:35 ` [PULL 00/13] NBD patches through 2021-01-20 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121023657.1186241-12-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).