From nobody Fri Nov 7 02:27:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545184506415484.5127477030994; Tue, 18 Dec 2018 17:55:06 -0800 (PST) Received: from localhost ([::1]:57228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZR4d-0001aL-CF for importer@patchew.org; Tue, 18 Dec 2018 20:54:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZR2W-000061-4q for qemu-devel@nongnu.org; Tue, 18 Dec 2018 20:52:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZR2V-0004SG-0t for qemu-devel@nongnu.org; Tue, 18 Dec 2018 20:52:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38352) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZR2S-0004Qd-BQ; Tue, 18 Dec 2018 20:52:44 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1092DD3C3F; Wed, 19 Dec 2018 01:52:43 +0000 (UTC) Received: from probe.redhat.com (ovpn-124-24.rdu2.redhat.com [10.10.124.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76BAE67CEF; Wed, 19 Dec 2018 01:52:37 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 18 Dec 2018 20:52:26 -0500 Message-Id: <20181219015230.18652-2-jsnow@redhat.com> In-Reply-To: <20181219015230.18652-1-jsnow@redhat.com> References: <20181219015230.18652-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 19 Dec 2018 01:52:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 1/5] iotests: add qmp recursive sorting function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scrip= ts')) 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 =20 +def ordered_kwargs(kwargs): + # kwargs prior to 3.6 are not ordered, so: + od =3D OrderedDict() + for k in sorted(kwargs.keys()): + if isinstance(kwargs[k], dict): + od[k] =3D ordered_kwargs(kwargs[k]) + else: + od[k] =3D kwargs[k] + return od + def qemu_img_create(*args): args =3D list(args) =20 @@ -257,8 +268,9 @@ def filter_img_info(output, filename): def log(msg, filters=3D[]): for flt in filters: msg =3D flt(msg) - if type(msg) is dict or type(msg) is list: - print(json.dumps(msg, sort_keys=3DTrue)) + if isinstance(msg, dict) or isinstance(msg, list): + sort_keys =3D not isinstance(msg, OrderedDict) + print(json.dumps(msg, sort_keys=3Dsort_keys)) else: print(msg) =20 @@ -448,8 +460,9 @@ class VM(qtest.QEMUQtestMachine): return result =20 def qmp_log(self, cmd, filters=3D[filter_testfiles], **kwargs): - logmsg =3D '{"execute": "%s", "arguments": %s}' % \ - (cmd, json.dumps(kwargs, sort_keys=3DTrue)) + full_cmd =3D OrderedDict({"execute": cmd, + "arguments": ordered_kwargs(kwargs)}) + logmsg =3D json.dumps(full_cmd) log(logmsg, filters) result =3D self.qmp(cmd, **kwargs) log(json.dumps(result, sort_keys=3DTrue), filters) --=20 2.17.2