From nobody Mon Feb 9 12:10:19 2026 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 1544829682095266.49762541634357; Fri, 14 Dec 2018 15:21:22 -0800 (PST) Received: from localhost ([::1]:35955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXwli-0005pY-Ts for importer@patchew.org; Fri, 14 Dec 2018 18:21:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXwgV-0000xX-76 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 18:15:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXwgU-0003He-8v for qemu-devel@nongnu.org; Fri, 14 Dec 2018 18:15:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXwgN-00024q-Pl; Fri, 14 Dec 2018 18:15:47 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B17A7138205; Fri, 14 Dec 2018 23:15:33 +0000 (UTC) Received: from probe.redhat.com (ovpn-122-54.rdu2.redhat.com [10.10.122.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAF5718506; Fri, 14 Dec 2018 23:15:31 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 18:15:11 -0500 Message-Id: <20181214231512.5295-7-jsnow@redhat.com> In-Reply-To: <20181214231512.5295-1-jsnow@redhat.com> References: <20181214231512.5295-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 14 Dec 2018 23:15:33 +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 v3 6/7] iotests: allow pretty-print for qmp_log 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" 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. Note that this changes the sort order for "command" and "arguments", so I restrict this reordering to occur only when the indent is specified. Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/iotests.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 9595429fea..ab5823c011 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -447,12 +447,21 @@ class VM(qtest.QEMUQtestMachine): result.append(filter_qmp_event(ev)) 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)) + def qmp_log(self, cmd, indent=3DNone, filters=3D[filter_testfiles], **= kwargs): + # Python < 3.4 needs to know not to add whitespace when pretty-pri= nting: + separators =3D (',', ': ') if indent is not None else (',', ': ') + if indent is not None: + fullcmd =3D { "execute": cmd, + "arguments": kwargs } + logmsg =3D json.dumps(fullcmd, indent=3Dindent, separators=3Ds= eparators, + sort_keys=3DTrue) + else: + logmsg =3D '{"execute": "%s", "arguments": %s}' % \ + (cmd, json.dumps(kwargs, sort_keys=3DTrue)) log(logmsg, filters) result =3D self.qmp(cmd, **kwargs) - log(json.dumps(result, sort_keys=3DTrue), filters) + log(json.dumps(result, indent=3Dindent, separators=3Dseparators, + sort_keys=3DTrue), filters) return result =20 def run_job(self, job, auto_finalize=3DTrue, auto_dismiss=3DFalse): --=20 2.17.2