From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru,
eblake@redhat.com, jsnow@redhat.com,
Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>
Subject: [PATCH v2 08/11] iotests: drop some extra ** in qmp() call
Date: Mon, 6 Jun 2022 10:27:28 +0300 [thread overview]
Message-ID: <20220606072731.878226-9-vsementsov@yandex-team.ru> (raw)
In-Reply-To: <20220606072731.878226-1-vsementsov@yandex-team.ru>
qmp() method supports passing dict (if it doesn't need substituting
'_' to '-' in keys). So, drop some extra '**' operators.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
tests/qemu-iotests/040 | 4 +-
tests/qemu-iotests/041 | 14 +++---
tests/qemu-iotests/129 | 2 +-
tests/qemu-iotests/147 | 2 +-
tests/qemu-iotests/155 | 2 +-
tests/qemu-iotests/264 | 12 ++---
tests/qemu-iotests/295 | 5 +-
tests/qemu-iotests/296 | 15 +++---
tests/qemu-iotests/tests/migrate-bitmaps-test | 4 +-
.../tests/mirror-ready-cancel-error | 50 +++++++++----------
10 files changed, 54 insertions(+), 56 deletions(-)
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index 2b68946744..46a4ec9bde 100755
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040
@@ -774,7 +774,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
result = self.vm.qmp('object-add', qom_type='throttle-group', id='tg')
self.assert_qmp(result, 'return', {})
- result = self.vm.qmp('blockdev-add', **{
+ result = self.vm.qmp('blockdev-add', {
'node-name': 'top-filter',
'driver': 'throttle',
'throttle-group': 'tg',
@@ -935,7 +935,7 @@ class TestCommitWithOverriddenBacking(iotests.QMPTestCase):
self.vm.launch()
# Use base_b instead of base_a as the backing of top
- result = self.vm.qmp('blockdev-add', **{
+ result = self.vm.qmp('blockdev-add', {
'node-name': 'top',
'driver': iotests.imgfmt,
'file': {
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 550e4dc391..3aef42aec8 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -236,7 +236,7 @@ class TestSingleBlockdev(TestSingleDrive):
args = {'driver': iotests.imgfmt,
'node-name': self.qmp_target,
'file': { 'filename': target_img, 'driver': 'file' } }
- result = self.vm.qmp("blockdev-add", **args)
+ result = self.vm.qmp("blockdev-add", args)
self.assert_qmp(result, 'return', {})
def test_mirror_to_self(self):
@@ -963,7 +963,7 @@ class TestRepairQuorum(iotests.QMPTestCase):
#assemble the quorum block device from the individual files
args = { "driver": "quorum", "node-name": "quorum0",
"vote-threshold": 2, "children": [ "img0", "img1", "img2" ] }
- result = self.vm.qmp("blockdev-add", **args)
+ result = self.vm.qmp("blockdev-add", args)
self.assert_qmp(result, 'return', {})
@@ -1278,7 +1278,7 @@ class TestReplaces(iotests.QMPTestCase):
"""
Check that we can replace filter nodes.
"""
- result = self.vm.qmp('blockdev-add', **{
+ result = self.vm.qmp('blockdev-add', {
'driver': 'copy-on-read',
'node-name': 'filter0',
'file': {
@@ -1319,7 +1319,7 @@ class TestFilters(iotests.QMPTestCase):
self.vm = iotests.VM().add_device('virtio-scsi,id=vio-scsi')
self.vm.launch()
- result = self.vm.qmp('blockdev-add', **{
+ result = self.vm.qmp('blockdev-add', {
'node-name': 'target',
'driver': iotests.imgfmt,
'file': {
@@ -1355,7 +1355,7 @@ class TestFilters(iotests.QMPTestCase):
os.remove(backing_img)
def test_cor(self):
- result = self.vm.qmp('blockdev-add', **{
+ result = self.vm.qmp('blockdev-add', {
'node-name': 'filter',
'driver': 'copy-on-read',
'file': self.filterless_chain
@@ -1384,7 +1384,7 @@ class TestFilters(iotests.QMPTestCase):
assert target_map[1]['depth'] == 0
def test_implicit_mirror_filter(self):
- result = self.vm.qmp('blockdev-add', **self.filterless_chain)
+ result = self.vm.qmp('blockdev-add', self.filterless_chain)
self.assert_qmp(result, 'return', {})
# We need this so we can query from above the mirror node
@@ -1418,7 +1418,7 @@ class TestFilters(iotests.QMPTestCase):
def test_explicit_mirror_filter(self):
# Same test as above, but this time we give the mirror filter
# a node-name so it will not be invisible
- result = self.vm.qmp('blockdev-add', **self.filterless_chain)
+ result = self.vm.qmp('blockdev-add', self.filterless_chain)
self.assert_qmp(result, 'return', {})
# We need this so we can query from above the mirror node
diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index c75ec62ecf..e1536ee3c3 100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
@@ -87,7 +87,7 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
iotests.qemu_img('create', '-f', iotests.imgfmt, self.overlay_img,
'1G')
- result = self.vm.qmp('blockdev-add', **{
+ result = self.vm.qmp('blockdev-add', {
'node-name': 'overlay',
'driver': iotests.imgfmt,
'file': {
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
index 770b73e2f4..08111c5108 100755
--- a/tests/qemu-iotests/147
+++ b/tests/qemu-iotests/147
@@ -58,7 +58,7 @@ class NBDBlockdevAddBase(iotests.QMPTestCase):
def client_test(self, filename, address, export=None,
node_name='nbd-blockdev', delete=True):
bao = self.blockdev_add_options(address, export, node_name)
- result = self.vm.qmp('blockdev-add', **bao)
+ result = self.vm.qmp('blockdev-add', bao)
self.assert_qmp(result, 'return', {})
found = False
diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155
index d3e1b7401e..0c073fd61b 100755
--- a/tests/qemu-iotests/155
+++ b/tests/qemu-iotests/155
@@ -110,7 +110,7 @@ class BaseClass(iotests.QMPTestCase):
elif self.target_blockdev_backing:
options['backing'] = self.target_blockdev_backing
- result = self.vm.qmp('blockdev-add', **options)
+ result = self.vm.qmp('blockdev-add', options)
self.assert_qmp(result, 'return', {})
def tearDown(self):
diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264
index bc431d1a19..f8a4c055f3 100755
--- a/tests/qemu-iotests/264
+++ b/tests/qemu-iotests/264
@@ -49,12 +49,12 @@ class TestNbdReconnect(iotests.QMPTestCase):
assert job in ('blockdev-backup', 'blockdev-mirror')
with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b):
result = self.vm.qmp('blockdev-add',
- **{'node_name': 'backup0',
- 'driver': 'raw',
- 'file': {'driver': 'nbd',
- 'server': {'type': 'unix',
- 'path': nbd_sock},
- 'reconnect-delay': 10}})
+ {'node-name': 'backup0',
+ 'driver': 'raw',
+ 'file': {'driver': 'nbd',
+ 'server': {'type': 'unix',
+ 'path': nbd_sock},
+ 'reconnect-delay': 10}})
self.assert_qmp(result, 'return', {})
result = self.vm.qmp(job, device='drive0',
sync='full', target='backup0',
diff --git a/tests/qemu-iotests/295 b/tests/qemu-iotests/295
index 270ad3999f..8ebe31054c 100755
--- a/tests/qemu-iotests/295
+++ b/tests/qemu-iotests/295
@@ -102,8 +102,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
}
}
- result = self.vm.qmp('blockdev-add', **
- {
+ result = self.vm.qmp('blockdev-add', {
'driver': iotests.imgfmt,
'node-name': id,
'read-only': read_only,
@@ -120,7 +119,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
# close the encrypted block device
def closeImageQmp(self, id):
- result = self.vm.qmp('blockdev-del', **{ 'node-name': id })
+ result = self.vm.qmp('blockdev-del', {'node-name': id})
self.assert_qmp(result, 'return', {})
###########################################################################
diff --git a/tests/qemu-iotests/296 b/tests/qemu-iotests/296
index 19a674c5ae..47d2526b72 100755
--- a/tests/qemu-iotests/296
+++ b/tests/qemu-iotests/296
@@ -42,7 +42,7 @@ class Secret:
return [ "secret,id=" + self._id + ",data=" + self._secret]
def to_qmp_object(self):
- return { "qom_type" : "secret", "id": self.id(),
+ return { "qom-type" : "secret", "id": self.id(),
"data": self.secret() }
################################################################################
@@ -61,9 +61,9 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
# create the secrets and load 'em into the VMs
self.secrets = [ Secret(i) for i in range(0, 4) ]
for secret in self.secrets:
- result = self.vm1.qmp("object-add", **secret.to_qmp_object())
+ result = self.vm1.qmp("object-add", secret.to_qmp_object())
self.assert_qmp(result, 'return', {})
- result = self.vm2.qmp("object-add", **secret.to_qmp_object())
+ result = self.vm2.qmp("object-add", secret.to_qmp_object())
self.assert_qmp(result, 'return', {})
# test case shutdown
@@ -135,15 +135,14 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
result = vm.qmp(command, options=[opts])
self.assert_qmp(result, 'return', {})
else:
- result = vm.qmp(command, **opts)
+ result = vm.qmp(command, opts)
self.assert_qmp(result, 'return', {})
###########################################################################
# add virtio-blk consumer for a block device
def addImageUser(self, vm, id, disk_id, share_rw=False):
- result = vm.qmp('device_add', **
- {
+ result = vm.qmp('device_add', {
'driver': 'virtio-blk',
'id': id,
'drive': disk_id,
@@ -155,7 +154,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
# close the encrypted block device
def closeImageQmp(self, vm, id):
- result = vm.qmp('blockdev-del', **{ 'node-name': id })
+ result = vm.qmp('blockdev-del', {'node-name': id})
self.assert_qmp(result, 'return', {})
###########################################################################
@@ -174,7 +173,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase):
},
}
- result = vm.qmp('x-blockdev-amend', **args)
+ result = vm.qmp('x-blockdev-amend', args)
iotests.log(result)
# Run the job only if it was created
event = ('JOB_STATUS_CHANGE',
diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-test b/tests/qemu-iotests/tests/migrate-bitmaps-test
index 8668caae1e..eebb256485 100755
--- a/tests/qemu-iotests/tests/migrate-bitmaps-test
+++ b/tests/qemu-iotests/tests/migrate-bitmaps-test
@@ -67,7 +67,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
if persistent:
params['persistent'] = True
- result = vm.qmp('block-dirty-bitmap-add', **params)
+ result = vm.qmp('block-dirty-bitmap-add', params)
self.assert_qmp(result, 'return', {})
def check_bitmap(self, vm, sha256):
@@ -256,7 +256,7 @@ class TestDirtyBitmapBackingMigration(iotests.QMPTestCase):
self.vm = iotests.VM()
self.vm.launch()
- result = self.vm.qmp('blockdev-add', **blockdev)
+ result = self.vm.qmp('blockdev-add', blockdev)
self.assert_qmp(result, 'return', {})
# Check that the bitmaps are there
diff --git a/tests/qemu-iotests/tests/mirror-ready-cancel-error b/tests/qemu-iotests/tests/mirror-ready-cancel-error
index 01217459b9..a59e245659 100755
--- a/tests/qemu-iotests/tests/mirror-ready-cancel-error
+++ b/tests/qemu-iotests/tests/mirror-ready-cancel-error
@@ -49,12 +49,12 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):
def add_blockdevs(self, once: bool) -> None:
res = self.vm.qmp('blockdev-add',
- **{'node-name': 'source',
- 'driver': iotests.imgfmt,
- 'file': {
- 'driver': 'file',
- 'filename': source
- }})
+ {'node-name': 'source',
+ 'driver': iotests.imgfmt,
+ 'file': {
+ 'driver': 'file',
+ 'filename': source
+ }})
self.assert_qmp(res, 'return', {})
# blkdebug notes:
@@ -63,25 +63,25 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):
# when the job is about to complete, and we want that one to
# fail.
res = self.vm.qmp('blockdev-add',
- **{'node-name': 'target',
- 'driver': iotests.imgfmt,
- 'file': {
- 'driver': 'blkdebug',
- 'image': {
- 'driver': 'file',
- 'filename': target
- },
- 'set-state': [{
- 'event': 'flush_to_disk',
- 'state': 1,
- 'new_state': 2
- }],
- 'inject-error': [{
- 'event': 'flush_to_disk',
- 'once': once,
- 'immediately': True,
- 'state': 2
- }]}})
+ {'node-name': 'target',
+ 'driver': iotests.imgfmt,
+ 'file': {
+ 'driver': 'blkdebug',
+ 'image': {
+ 'driver': 'file',
+ 'filename': target
+ },
+ 'set-state': [{
+ 'event': 'flush_to_disk',
+ 'state': 1,
+ 'new_state': 2
+ }],
+ 'inject-error': [{
+ 'event': 'flush_to_disk',
+ 'once': once,
+ 'immediately': True,
+ 'state': 2
+ }]}})
self.assert_qmp(res, 'return', {})
def start_mirror(self) -> None:
--
2.25.1
next prev parent reply other threads:[~2022-06-06 8:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 7:27 [PATCH v2 00/11] iotests: use vm.cmd() Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 01/11] python: rename QEMUMonitorProtocol.cmd() to cmd_raw() Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 02/11] python/qemu: rename command() to cmd() Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 03/11] python/machine.py: upgrade vm.cmd() method Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 04/11] iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 05/11] iotests: add some missed checks of qmp result Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 06/11] iotests: refactor some common qmp result checks into generic pattern Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 07/11] iotests: drop some occasional semicolons Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` Vladimir Sementsov-Ogievskiy [this message]
2022-06-06 7:27 ` [PATCH v2 09/11] iotests.py: pause_job(): drop return value Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 10/11] tests/vm/basevm.py: use cmd() instead of qmp() Vladimir Sementsov-Ogievskiy
2022-06-06 7:27 ` [PATCH v2 11/11] python: use vm.cmd() instead of vm.qmp() where appropriate Vladimir Sementsov-Ogievskiy
2022-09-19 17:16 ` [PATCH v2 00/11] iotests: use vm.cmd() Vladimir Sementsov-Ogievskiy
2022-10-12 13:25 ` Vladimir Sementsov-Ogievskiy
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=20220606072731.878226-9-vsementsov@yandex-team.ru \
--to=vsementsov@yandex-team.ru \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.