[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 1/5] iotests: add qmp recursive sorting function
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v4 1/5] iotests: add qmp recursive sorting function |
Date: |
Tue, 18 Dec 2018 20:52:26 -0500 |
Python before 3.6 does not sort kwargs by default.
If we want to print out pretty-printed QMP objects while
preserving the "exec" > "arguments" ordering, we need a custom sort.
We can accomplish this by sorting **kwargs into an OrderedDict,
which does preserve addition order.
---
tests/qemu-iotests/iotests.py | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 9595429fea..9aec03c7a3 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -30,6 +30,7 @@ import signal
import logging
import atexit
import io
+from collections import OrderedDict
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts'))
import qtest
@@ -75,6 +76,16 @@ def qemu_img(*args):
sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, '
'.join(qemu_img_args + list(args))))
return exitcode
+def ordered_kwargs(kwargs):
+ # kwargs prior to 3.6 are not ordered, so:
+ od = OrderedDict()
+ for k in sorted(kwargs.keys()):
+ if isinstance(kwargs[k], dict):
+ od[k] = ordered_kwargs(kwargs[k])
+ else:
+ od[k] = kwargs[k]
+ return od
+
def qemu_img_create(*args):
args = list(args)
@@ -257,8 +268,9 @@ def filter_img_info(output, filename):
def log(msg, filters=[]):
for flt in filters:
msg = flt(msg)
- if type(msg) is dict or type(msg) is list:
- print(json.dumps(msg, sort_keys=True))
+ if isinstance(msg, dict) or isinstance(msg, list):
+ sort_keys = not isinstance(msg, OrderedDict)
+ print(json.dumps(msg, sort_keys=sort_keys))
else:
print(msg)
@@ -448,8 +460,9 @@ class VM(qtest.QEMUQtestMachine):
return result
def qmp_log(self, cmd, filters=[filter_testfiles], **kwargs):
- logmsg = '{"execute": "%s", "arguments": %s}' % \
- (cmd, json.dumps(kwargs, sort_keys=True))
+ full_cmd = OrderedDict({"execute": cmd,
+ "arguments": ordered_kwargs(kwargs)})
+ logmsg = json.dumps(full_cmd)
log(logmsg, filters)
result = self.qmp(cmd, **kwargs)
log(json.dumps(result, sort_keys=True), filters)
--
2.17.2
[Qemu-block] [PATCH v4 2/5] iotests: remove default filters from qmp_log, John Snow, 2018/12/18
[Qemu-block] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, John Snow, 2018/12/18