ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests/222: fix pylint and mypy complains 

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>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210824083856.17408-27-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-08-24 11:38:48 +03:00 committed by Hanna Reitz
parent 15c3b863ee
commit f08ef04371
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/qemu-iotests/222
View File

@ -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

2
tests/qemu-iotests/297
View File

@ -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',