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 1545184695109914.7282992342854; Tue, 18 Dec 2018 17:58:15 -0800 (PST) Received: from localhost ([::1]:57257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZR7l-0004Kv-SB for importer@patchew.org; Tue, 18 Dec 2018 20:58:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZR2c-0000BT-Ef for qemu-devel@nongnu.org; Tue, 18 Dec 2018 20:52:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZR2a-0004WT-GN for qemu-devel@nongnu.org; Tue, 18 Dec 2018 20:52:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46876) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZR2V-0004SB-If; Tue, 18 Dec 2018 20:52:47 -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 C3E1F81DED; Wed, 19 Dec 2018 01:52:46 +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 4B76268875; Wed, 19 Dec 2018 01:52:45 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 18 Dec 2018 20:52:28 -0500 Message-Id: <20181219015230.18652-4-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.25]); Wed, 19 Dec 2018 01:52:46 +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 3/5] iotests: change qmp_log filters to expect QMP objects only 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" log() treats filters as if they can always filter its primary argument. qmp_log treats filters as if they're always text. Change qmp_log to treat filters as if they're always qmp object filters, then change the logging call to rely on log()'s ability to serialize QMP objects, so we're not duplicating that effort. Because kwargs have been sorted already, the order is preserved. Edit the only caller who uses filters on qmp_log to use a qmp version, also added in this patch. --- tests/qemu-iotests/206 | 4 ++-- tests/qemu-iotests/iotests.py | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206 index e92550fa59..5bb738bf23 100755 --- a/tests/qemu-iotests/206 +++ b/tests/qemu-iotests/206 @@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=3D['qcow2']) =20 def blockdev_create(vm, options): result =3D vm.qmp_log('blockdev-create', - filters=3D[iotests.filter_testfiles], + filters=3D[iotests.filter_qmp_testfiles], job_id=3D'job0', options=3Doptions) =20 if 'return' in result: @@ -55,7 +55,7 @@ with iotests.FilePath('t.qcow2') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', - filters=3D[iotests.filter_testfiles], + filters=3D[iotests.filter_qmp_testfiles], driver=3D'file', filename=3Ddisk_path, node_name=3D'imgfile') =20 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 55fb60e039..812302538d 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -246,10 +246,29 @@ def filter_qmp_event(event): event['timestamp']['microseconds'] =3D 'USECS' return event =20 +def filter_qmp(qmsg, filter_fn): + '''Given a string filter, filter a QMP object's values. + filter_fn takes a (key, value) pair.''' + for key in qmsg: + if isinstance(qmsg[key], list): + qmsg[key] =3D [filter_qmp(atom, filter_fn) for atom in qmsg[ke= y]] + elif isinstance(qmsg[key], dict): + qmsg[key] =3D filter_qmp(qmsg[key], filter_fn) + else: + qmsg[key] =3D filter_fn(key, qmsg[key]) + return qmsg + def filter_testfiles(msg): prefix =3D os.path.join(test_dir, "%s-" % (os.getpid())) return msg.replace(prefix, 'TEST_DIR/PID-') =20 +def filter_qmp_testfiles(qmsg): + def _filter(key, value): + if key =3D=3D 'filename' or key =3D=3D 'backing-file': + return filter_testfiles(value) + return value + return filter_qmp(qmsg, _filter) + def filter_generated_node_ids(msg): return re.sub("#block[0-9]+", "NODE_NAME", msg) =20 @@ -462,10 +481,9 @@ class VM(qtest.QEMUQtestMachine): def qmp_log(self, cmd, filters=3D[], **kwargs): full_cmd =3D OrderedDict({"execute": cmd, "arguments": ordered_kwargs(kwargs)}) - logmsg =3D json.dumps(full_cmd) - log(logmsg, filters) + log(full_cmd, filters) result =3D self.qmp(cmd, **kwargs) - log(json.dumps(result, sort_keys=3DTrue), filters) + log(result, filters) return result =20 def run_job(self, job, auto_finalize=3DTrue, auto_dismiss=3DFalse): --=20 2.17.2