From: Eric Blake <eblake@redhat.com>
To: John Snow <jsnow@redhat.com>,
qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: vsementsov@virtuozzo.com, Kevin Wolf <kwolf@redhat.com>,
Max Reitz <mreitz@redhat.com>, Fam Zheng <fam@euphon.net>,
Markus Armbruster <armbru@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v5 07/11] iotests: add qmp recursive sorting function
Date: Wed, 19 Dec 2018 20:40:26 -0600 [thread overview]
Message-ID: <fc598fa9-31ba-ce75-2add-0ff56bcbe2a7@redhat.com> (raw)
In-Reply-To: <20181220022952.20493-8-jsnow@redhat.com>
On 12/19/18 8:29 PM, John Snow wrote:
> Python before 3.6 does not sort dictionaries (including kwargs).
> Therefore, printing QMP objects involves sorting the keys to have
> a predictable ordering in the iotests output.
It may be worth also mentioning that sometimes this sorting results in
the log showing things in a different order than the source command
(with no ill effect, as long as the output order is deterministic).
>
> However, if we want to pretty-print QMP objects being sent to the
> QEMU process, we need to build the entire command before logging it.
> Ordinarily, this would then involve "arguments" being sorted above
> "execute", which would necessitate a rather ugly and harder-to-read
> change to many iotests outputs.
>
> To facilitate pretty-printing AND maintaining predictable output AND
> having "arguments" sort before "execute", add a custom sort function
s/before/after/
> that takes a dictionary and recursively builds an OrderedDict that
> maintains the specific key order we wish to see in iotests output.
namely, keys within subdicts are sorted by key name (even if that is not
the order they were input), but the top-level struct with "execute" and
"arguments" stays the way we want it.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> tests/qemu-iotests/iotests.py | 24 ++++++++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
next prev parent reply other threads:[~2018-12-20 2:40 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 2:29 [Qemu-devel] [PATCH v5 00/11] bitmaps: remove x- prefix from QMP api John Snow
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 01/11] blockdev: abort transactions in reverse order John Snow
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 02/11] block/dirty-bitmap: remove assertion from restore John Snow
2018-12-20 2:41 ` Eric Blake
2018-12-20 8:33 ` Vladimir Sementsov-Ogievskiy
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 03/11] blockdev: n-ary bitmap merge John Snow
2018-12-20 2:48 ` Eric Blake
2018-12-20 21:03 ` John Snow
2018-12-20 9:23 ` Vladimir Sementsov-Ogievskiy
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 04/11] block: remove 'x' prefix from experimental bitmap APIs John Snow
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 05/11] iotests.py: don't abort if IMGKEYSECRET is undefined John Snow
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 06/11] iotests: add filter_generated_node_ids John Snow
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 07/11] iotests: add qmp recursive sorting function John Snow
2018-12-20 2:40 ` Eric Blake [this message]
2018-12-20 9:42 ` Vladimir Sementsov-Ogievskiy
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 08/11] iotests: remove default filters from qmp_log John Snow
2018-12-20 2:50 ` Eric Blake
2018-12-20 9:48 ` Vladimir Sementsov-Ogievskiy
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 09/11] iotests: change qmp_log filters to expect QMP objects only John Snow
2018-12-20 2:53 ` Eric Blake
2018-12-20 22:12 ` John Snow
2018-12-20 11:21 ` Vladimir Sementsov-Ogievskiy
2018-12-20 22:26 ` John Snow
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 10/11] iotests: implement pretty-print for log and qmp_log John Snow
2018-12-20 2:55 ` Eric Blake
2018-12-20 11:29 ` Vladimir Sementsov-Ogievskiy
2018-12-20 2:29 ` [Qemu-devel] [PATCH v5 11/11] iotests: add iotest 236 for testing bitmap merge John Snow
2018-12-20 3:02 ` Eric Blake
2018-12-20 20:58 ` John Snow
2018-12-20 12:12 ` Vladimir Sementsov-Ogievskiy
2018-12-20 20:53 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fc598fa9-31ba-ce75-2add-0ff56bcbe2a7@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).