From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI5D-0000dw-En for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:22:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyI5B-0001KQ-D6 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:22:19 -0500 From: Kevin Wolf Date: Mon, 25 Feb 2019 16:20:14 +0100 Message-Id: <20190225152053.15976-33-kwolf@redhat.com> In-Reply-To: <20190225152053.15976-1-kwolf@redhat.com> References: <20190225152053.15976-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 32/71] iotests.py: Add filter_imgfmt() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org From: Max Reitz Signed-off-by: Max Reitz Message-id: 20190201192935.18394-7-mreitz@redhat.com Reviewed-by: Eric Blake Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.p= y index b461f53abf..d80fd7fc2a 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -304,6 +304,16 @@ def filter_img_info(output, filename): lines.append(line) return '\n'.join(lines) =20 +def filter_imgfmt(msg): + return msg.replace(imgfmt, 'IMGFMT') + +def filter_qmp_imgfmt(qmsg): + def _filter(key, value): + if is_str(value): + return filter_imgfmt(value) + return value + return filter_qmp(qmsg, _filter) + def log(msg, filters=3D[], indent=3DNone): '''Logs either a string message or a JSON serializable message (like= QMP). If indent is provided, JSON serializable messages are pretty-printed= .''' --=20 2.20.1