[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log()
From: |
Jeff Cody |
Subject: |
Re: [Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log() |
Date: |
Tue, 29 May 2018 14:31:36 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Fri, May 25, 2018 at 06:33:19PM +0200, Kevin Wolf wrote:
> This adds a helper function that logs both the QMP request and the
> received response before returning it.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> tests/qemu-iotests/iotests.py | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 17aa7c88dc..319d898172 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -206,6 +206,10 @@ def filter_qmp_event(event):
> event['timestamp']['microseconds'] = 'USECS'
> return event
>
> +def filter_testfiles(msg):
> + prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
> + return msg.replace(prefix, 'TEST_DIR/')
> +
Either as-is, or with the suggestion by Max to add the PID to the output:
Reviewed-by: Jeff Cody <address@hidden>
> def log(msg, filters=[]):
> for flt in filters:
> msg = flt(msg)
> @@ -389,6 +393,13 @@ class VM(qtest.QEMUQtestMachine):
> result.append(filter_qmp_event(ev))
> return result
>
> + def qmp_log(self, cmd, **kwargs):
> + logmsg = "{'execute': '%s', 'arguments': %s}" % (cmd, kwargs)
> + log(filter_testfiles(logmsg))
> + result = self.qmp(cmd, **kwargs)
> + log(result)
> + return result
> +
>
> index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
>
> --
> 2.13.6
>
>
- Re: [Qemu-block] [PATCH 04/14] block/create: Make x-blockdev-create a job, (continued)
Re: [Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log(),
Jeff Cody <=
[Qemu-block] [PATCH 07/14] qemu-iotests: Add iotests.img_info_log(), Kevin Wolf, 2018/05/25
[Qemu-block] [PATCH 09/14] qemu-iotests: Rewrite 207 for blockdev-create job, Kevin Wolf, 2018/05/25
[Qemu-block] [PATCH 10/14] qemu-iotests: Rewrite 210 for blockdev-create job, Kevin Wolf, 2018/05/25
[Qemu-block] [PATCH 08/14] qemu-iotests: Rewrite 206 for blockdev-create job, Kevin Wolf, 2018/05/25