From nobody Sun Oct 5 21:10:50 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154748334433874.22386020655836; Mon, 14 Jan 2019 08:29:04 -0800 (PST) Received: from localhost ([127.0.0.1]:39338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj56k-0005N8-AC for importer@patchew.org; Mon, 14 Jan 2019 11:29:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj54V-0003mu-01 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 11:26:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj54T-0005NO-Q6 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 11:26:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60614) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj54K-00055a-RJ; Mon, 14 Jan 2019 11:26:34 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D2213C2CF5; Mon, 14 Jan 2019 16:26:20 +0000 (UTC) Received: from blue.redhat.com (ovpn-117-16.phx2.redhat.com [10.3.117.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F4B612A6E; Mon, 14 Jan 2019 16:26:19 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 10:25:54 -0600 Message-Id: <20190114162605.5330-10-eblake@redhat.com> In-Reply-To: <20190114162605.5330-1-eblake@redhat.com> References: <20190114162605.5330-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 14 Jan 2019 16:26:20 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 09/20] 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 , Vladimir Sementsov-Ogievskiy , John Snow , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: John Snow As laid out in the previous commit's message: ``` Several places in iotests deal with serializing objects into JSON strings, but to add pretty-printing it seems desirable to localize all of those cases. log() seems like a good candidate for that centralized behavior. log() can already serialize json objects, but when it does so, it assumes filters=3D[] operates on QMP objects, not strings. qmp_log currently operates by dumping outgoing and incoming QMP objects into strings and filtering them assuming that filters=3D[] are string filters. ``` Therefore: 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. Add a qmp version of filter_testfiles and adjust the only caller using it for qmp_log to use the qmp version. Signed-off-by: John Snow Message-Id: <20181221093529.23855-10-jsnow@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Eric Blake --- tests/qemu-iotests/206 | 4 ++-- tests/qemu-iotests/iotests.py | 28 +++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206 index e92550fa59f..5bb738bf23c 100755 --- a/tests/qemu-iotests/206 +++ b/tests/qemu-iotests/206 @@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=3D['qcow2']) 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) if 'return' in result: @@ -55,7 +55,7 @@ with iotests.FilePath('t.qcow2') as disk_path, \ 'size': 0 }) 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') diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 57fe20db45a..a96a7010d49 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -246,10 +246,33 @@ def filter_qmp_event(event): event['timestamp']['microseconds'] =3D 'USECS' return event +def filter_qmp(qmsg, filter_fn): + '''Given a string filter, filter a QMP object's values. + filter_fn takes a (key, value) pair.''' + # Iterate through either lists or dicts; + if isinstance(qmsg, list): + items =3D enumerate(qmsg) + else: + items =3D qmsg.items() + + for k, v in items: + if isinstance(v, list) or isinstance(v, dict): + qmsg[k] =3D filter_qmp(v, filter_fn) + else: + qmsg[k] =3D filter_fn(k, v) + return qmsg + def filter_testfiles(msg): prefix =3D os.path.join(test_dir, "%s-" % (os.getpid())) return msg.replace(prefix, 'TEST_DIR/PID-') +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) @@ -465,10 +488,9 @@ class VM(qtest.QEMUQtestMachine): ("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 def run_job(self, job, auto_finalize=3DTrue, auto_dismiss=3DFalse): --=20 2.20.1