On 2018-05-25 18:33, 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 <kw...@redhat.com> > --- > 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/')
I'd prefer 'TEST_DIR/PID-' (just because).
But if you really like just 'TEST_DIR/'... Then OK.
> +
> 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)
I think we should apply the testfiles filter here, too (error messages
may contain file names, after all).
Max
> + return result
> +
>
> index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
>
>
signature.asc
Description: OpenPGP digital signature
