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

iotests: refactor some common qmp result checks into generic pattern 

To simplify further conversion.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20231006154125.1068348-10-vsementsov@yandex-team.ru
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2023-10-06 18:41:19 +03:00 committed by John Snow
parent f7ccc3295b
commit d24eb059fa
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/qemu-iotests/040
View File

@ -62,9 +62,10 @@ class ImageCommitTestCase(iotests.QMPTestCase):
self.assert_no_active_block_jobs() self.assert_no_active_block_jobs()
if node_names: if node_names:
result = self.vm.qmp('block-commit', device='drive0', top_node=top, base_node=base) result = self.vm.qmp('block-commit', device='drive0', top_node=top, base_node=base)
self.assert_qmp(result, 'return', {})
else: else:
result = self.vm.qmp('block-commit', device='drive0', top=top, base=base) result = self.vm.qmp('block-commit', device='drive0', top=top, base=base)
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})
self.wait_for_complete(need_ready) self.wait_for_complete(need_ready)
def run_default_commit_test(self): def run_default_commit_test(self):

3
tests/qemu-iotests/147
View File

@ -159,10 +159,11 @@ class BuiltinNBD(NBDBlockdevAddBase):
if export_name is None: if export_name is None:
result = self.server.qmp('nbd-server-add', device='nbd-export') result = self.server.qmp('nbd-server-add', device='nbd-export')
self.assert_qmp(result, 'return', {})
else: else:
result = self.server.qmp('nbd-server-add', device='nbd-export', result = self.server.qmp('nbd-server-add', device='nbd-export',
name=export_name) name=export_name)
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})
if export_name2 is not None: if export_name2 is not None:
result = self.server.qmp('nbd-server-add', device='nbd-export', result = self.server.qmp('nbd-server-add', device='nbd-export',

4
tests/qemu-iotests/155
View File

@ -181,6 +181,7 @@ class MirrorBaseClass(BaseClass):
result = self.vm.qmp(self.cmd, job_id='mirror-job', device='source', result = self.vm.qmp(self.cmd, job_id='mirror-job', device='source',
sync=sync, target='target', sync=sync, target='target',
auto_finalize=False) auto_finalize=False)
self.assert_qmp(result, 'return', {})
else: else:
if self.existing: if self.existing:
mode = 'existing' mode = 'existing'
@ -190,8 +191,7 @@ class MirrorBaseClass(BaseClass):
sync=sync, target=target_img, sync=sync, target=target_img,
format=iotests.imgfmt, mode=mode, format=iotests.imgfmt, mode=mode,
node_name='target', auto_finalize=False) node_name='target', auto_finalize=False)
self.assert_qmp(result, 'return', {})
self.assert_qmp(result, 'return', {})
self.vm.run_job('mirror-job', auto_finalize=False, self.vm.run_job('mirror-job', auto_finalize=False,
pre_finalize=self.openBacking, auto_dismiss=True) pre_finalize=self.openBacking, auto_dismiss=True)

4
tests/qemu-iotests/218
View File

@ -61,14 +61,14 @@ def start_mirror(vm, speed=None, buf_size=None):
sync='full', sync='full',
speed=speed, speed=speed,
buf_size=buf_size) buf_size=buf_size)
assert ret['return'] == {}
else: else:
ret = vm.qmp('blockdev-mirror', ret = vm.qmp('blockdev-mirror',
job_id='mirror', job_id='mirror',
device='source', device='source',
target='target', target='target',
sync='full') sync='full')
assert ret['return'] == {}
assert ret['return'] == {}
log('') log('')

3
tests/qemu-iotests/296
View File

@ -133,9 +133,10 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
if reOpen: if reOpen:
result = vm.qmp(command, options=[opts]) result = vm.qmp(command, options=[opts])
self.assert_qmp(result, 'return', {})
else: else:
result = vm.qmp(command, **opts) result = vm.qmp(command, **opts)
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})
########################################################################### ###########################################################################