summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2015-01-30 10:49:45 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2015-02-16 15:07:18 +0000
commitdf89d112279779609d50db93b024ed71f0402854 (patch)
treeaba55eb683aae32b999b48c742ab971120cd08a1 /tests
parented338bb07504091dbf36d9cc741e8363f1962a74 (diff)
downloadhqemu-df89d112279779609d50db93b024ed71f0402854.zip
hqemu-df89d112279779609d50db93b024ed71f0402854.tar.gz
qemu-iotests: Allow caller to disable underscore convertion for qmp
QMP command "block_set_io_throttle" expects underscores in parameters instead of dashes: {iops,bps}_{rd,wr,max}. Add optional argument conv_keys (defaults to True, backward compatible), it will be used in IO throttling test case. Reviewed-by: Benoit Canet <benoit@irqsave.net> Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 1422586186-9925-5-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qemu-iotests/iotests.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 85cb9a5..1402854 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -185,11 +185,14 @@ class VM(object):
self._popen = None
underscore_to_dash = string.maketrans('_', '-')
- def qmp(self, cmd, **args):
+ def qmp(self, cmd, conv_keys=True, **args):
'''Invoke a QMP command and return the result dict'''
qmp_args = dict()
for k in args.keys():
- qmp_args[k.translate(self.underscore_to_dash)] = args[k]
+ if conv_keys:
+ qmp_args[k.translate(self.underscore_to_dash)] = args[k]
+ else:
+ qmp_args[k] = args[k]
return self._qmp.cmd(cmd, args=qmp_args)
OpenPOWER on IntegriCloud