[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 10/11] iotests: implement pretty-print for log an
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v5 10/11] iotests: implement pretty-print for log and qmp_log |
Date: |
Wed, 19 Dec 2018 21:29:51 -0500 |
If iotests have lines exceeding >998 characters long, git doesn't
want to send it plaintext to the list. We can solve this by allowing
the iotests to use pretty printed QMP output that we can match against
instead.
As a bonus, it's much nicer for human eyes too.
Signed-off-by: John Snow <address@hidden>
---
tests/qemu-iotests/iotests.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index dcd0c6f71d..d65bcaf953 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -284,13 +284,18 @@ def filter_img_info(output, filename):
lines.append(line)
return '\n'.join(lines)
-def log(msg, filters=[]):
+def log(msg, filters=[], indent=None):
+ '''Logs either a string message or a JSON serializable message (like QMP).
+ If indent is provided, JSON serializable messages are pretty-printed.'''
for flt in filters:
msg = flt(msg)
if isinstance(msg, dict) or isinstance(msg, list):
+ # Python < 3.4 needs to know not to add whitespace when
pretty-printing:
+ separators = (', ', ': ') if indent is None else (',', ': ')
# Don't sort if it's already sorted
do_sort = not isinstance(msg, OrderedDict)
- print(json.dumps(msg, sort_keys=do_sort))
+ print(json.dumps(msg, sort_keys=do_sort,
+ indent=indent, separators=separators))
else:
print(msg)
@@ -479,14 +484,14 @@ class VM(qtest.QEMUQtestMachine):
result.append(filter_qmp_event(ev))
return result
- def qmp_log(self, cmd, filters=[], **kwargs):
+ def qmp_log(self, cmd, filters=[], indent=None, **kwargs):
full_cmd = OrderedDict((
("execute", cmd),
("arguments", ordered_kwargs(kwargs))
))
- log(full_cmd, filters)
+ log(full_cmd, filters, indent=indent)
result = self.qmp(cmd, **kwargs)
- log(result, filters)
+ log(result, filters, indent=indent)
return result
def run_job(self, job, auto_finalize=True, auto_dismiss=False):
--
2.17.2
- Re: [Qemu-devel] [PATCH v5 03/11] blockdev: n-ary bitmap merge, (continued)
- [Qemu-devel] [PATCH v5 04/11] block: remove 'x' prefix from experimental bitmap APIs, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 06/11] iotests: add filter_generated_node_ids, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 05/11] iotests.py: don't abort if IMGKEYSECRET is undefined, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 08/11] iotests: remove default filters from qmp_log, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 07/11] iotests: add qmp recursive sorting function, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 10/11] iotests: implement pretty-print for log and qmp_log,
John Snow <=
- [Qemu-devel] [PATCH v5 09/11] iotests: change qmp_log filters to expect QMP objects only, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 11/11] iotests: add iotest 236 for testing bitmap merge, John Snow, 2018/12/19