Re: [Qemu-devel] [PATCH 3/4] qemu-iotests: Allow caller to disable underscore convertion for qmp

["Benoît Canet" <benoit.canet@irqsave.net>]

Le Wednesday 29 Jan 2014 à 16:40:42 (+0800), Fam Zheng a écrit :
> 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.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/iotests.py | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index ca79d09..c1f5427 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -179,11 +179,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)
>  
> -- 
> 1.8.5.3
> 
> 
Reviewed-by: Benoit Canet <benoit@irqsave.net>