[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 26/33] iotests/222: fix pylint and mypy complains
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 26/33] iotests/222: fix pylint and mypy complains |
Date: |
Thu, 20 May 2021 17:21:58 +0300 |
Here:
- long line
- move to new interface of vm.qmp() (direct passing dict), to avoid
mypy false-positive, as it thinks that unpacked dict is a positional
argument.
- extra parenthesis
- handle event_wait possible None value
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/222 | 20 +++++++++++---------
tests/qemu-iotests/297 | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222
index b48afe623e..5e2556f8df 100755
--- a/tests/qemu-iotests/222
+++ b/tests/qemu-iotests/222
@@ -50,7 +50,8 @@ remainder = [("0xd5", "0x108000", "32k"), # Right-end of
partial-left [1]
with iotests.FilePath('base.img') as base_img_path, \
iotests.FilePath('fleece.img') as fleece_img_path, \
- iotests.FilePath('nbd.sock', base_dir=iotests.sock_dir) as nbd_sock_path,
\
+ iotests.FilePath('nbd.sock',
+ base_dir=iotests.sock_dir) as nbd_sock_path, \
iotests.VM() as vm:
log('--- Setting up images ---')
@@ -81,7 +82,7 @@ with iotests.FilePath('base.img') as base_img_path, \
tgt_node = "fleeceNode"
# create tgt_node backed by src_node
- log(vm.qmp("blockdev-add", **{
+ log(vm.qmp("blockdev-add", {
"driver": "qcow2",
"node-name": tgt_node,
"file": {
@@ -103,8 +104,8 @@ with iotests.FilePath('base.img') as base_img_path, \
nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path)
log(vm.qmp("nbd-server-start",
- **{"addr": { "type": "unix",
- "data": { "path": nbd_sock_path } } }))
+ {"addr": { "type": "unix",
+ "data": { "path": nbd_sock_path } } }))
log(vm.qmp("nbd-server-add", device=tgt_node))
@@ -112,7 +113,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('--- Sanity Check ---')
log('')
- for p in (patterns + zeroes):
+ for p in patterns + zeroes:
cmd = "read -P%s %s %s" % p
log(cmd)
assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0
@@ -130,7 +131,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('--- Verifying Data ---')
log('')
- for p in (patterns + zeroes):
+ for p in patterns + zeroes:
cmd = "read -P%s %s %s" % p
log(cmd)
assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0
@@ -140,8 +141,9 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
log(vm.qmp('block-job-cancel', device=src_node))
- log(vm.event_wait('BLOCK_JOB_CANCELLED'),
- filters=[iotests.filter_qmp_event])
+ e = vm.event_wait('BLOCK_JOB_CANCELLED')
+ assert e is not None
+ log(e, filters=[iotests.filter_qmp_event])
log(vm.qmp('nbd-server-stop'))
log(vm.qmp('blockdev-del', node_name=tgt_node))
vm.shutdown()
@@ -150,7 +152,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('--- Confirming writes ---')
log('')
- for p in (overwrite + remainder):
+ for p in overwrite + remainder:
cmd = "read -P%s %s %s" % p
log(cmd)
assert qemu_io_silent(base_img_path, '-c', cmd) == 0
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index a37910b42d..7cb8c531fd 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -31,7 +31,7 @@ SKIP_FILES = (
'096', '118', '124', '132', '136', '139', '147', '148', '149',
'151', '152', '155', '163', '165', '169', '194', '196', '199', '202',
'203', '205', '206', '207', '208', '210', '211', '212', '213', '216',
- '218', '219', '222', '224', '228', '234', '235', '236', '237', '238',
+ '218', '219', '224', '228', '234', '235', '236', '237', '238',
'240', '242', '245', '246', '248', '255', '256', '257', '258', '260',
'262', '264', '266', '274', '277', '280', '281', '295', '296', '298',
'299', '302', '303', '304', '307',
--
2.29.2
- [PATCH v2 14/33] block/copy-before-write: bdrv_cbw_append(): replace child at last, (continued)
- [PATCH v2 14/33] block/copy-before-write: bdrv_cbw_append(): replace child at last, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 28/33] iotests: move 222 to tests/image-fleecing, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 15/33] block/copy-before-write: introduce cbw_init(), Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 16/33] block/copy-before-write: cbw_init(): rename variables, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 17/33] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 25/33] iotests.py: VM: add own __enter__ method, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 18/33] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 26/33] iotests/222: fix pylint and mypy complains,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 20/33] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 22/33] qapi: publish copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 27/33] iotests/222: constantly use single quotes for strings, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 29/33] iotests.py: hmp_qemu_io: support qdev, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 19/33] block/copy-before-write: initialize block-copy bitmap, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 21/33] block/copy-before-write: make public block driver, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 24/33] python/qemu/machine: QEMUMachine: improve qmp() method, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 30/33] iotests/image-fleecing: proper source device, Vladimir Sementsov-Ogievskiy, 2021/05/20
- [PATCH v2 31/33] iotests/image-fleecing: rename tgt_node, Vladimir Sementsov-Ogievskiy, 2021/05/20