From patchwork Tue Oct 1 19:46:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 11169607 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09DFB1709 for ; Tue, 1 Oct 2019 20:10:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE37A2133F for ; Tue, 1 Oct 2019 20:10:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE37A2133F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFOTW-0007s6-6x for patchwork-qemu-devel@patchwork.kernel.org; Tue, 01 Oct 2019 16:10:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54208) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO7o-0004b4-4U for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO7m-0007sK-Hx for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36219) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO7c-0007j5-Ne; Tue, 01 Oct 2019 15:47:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 913BDC04D293; Tue, 1 Oct 2019 19:47:43 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2AB731001947; Tue, 1 Oct 2019 19:47:42 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 11/67] iotests/224: Filter json:{} from commit command Date: Tue, 1 Oct 2019 21:46:19 +0200 Message-Id: <20191001194715.2796-12-mreitz@redhat.com> In-Reply-To: <20191001194715.2796-1-mreitz@redhat.com> References: <20191001194715.2796-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 01 Oct 2019 19:47: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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We only care that block-commit works with json:{} filenames, we do not need to see their exact values in the output. Signed-off-by: Max Reitz --- tests/qemu-iotests/224 | 15 ++++++++++++--- tests/qemu-iotests/224.out | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/224 b/tests/qemu-iotests/224 index d0d0c44104..e227d3ab3c 100755 --- a/tests/qemu-iotests/224 +++ b/tests/qemu-iotests/224 @@ -22,12 +22,19 @@ import iotests from iotests import log, qemu_img, qemu_io_silent, filter_qmp_testfiles, \ - filter_qmp_imgfmt + filter_qmp_imgfmt, filter_json_filename import json +import re # Need backing file support (for arbitrary backing formats) iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed']) +def filter_json_top_or_base(qmsg): + def _filter(key, value): + if key == 'base' or key == 'top': + return filter_json_filename(value) + return value + return iotests.filter_qmp(qmsg, _filter) # There are two variations of this test: # (1) We do not set filter_node_name. In that case, the commit_top @@ -104,7 +111,8 @@ for filter_node_name in False, True: top=mid_name, base=base_name, speed=1, - filters=[filter_qmp_testfiles, filter_qmp_imgfmt]) + filters=[filter_qmp_testfiles, filter_qmp_imgfmt, + filter_json_top_or_base]) else: vm.qmp_log('block-commit', job_id='commit', @@ -112,7 +120,8 @@ for filter_node_name in False, True: top=mid_name, base=base_name, speed=1, - filters=[filter_qmp_testfiles, filter_qmp_imgfmt]) + filters=[filter_qmp_testfiles, filter_qmp_imgfmt, + filter_json_top_or_base]) vm.qmp_log('job-pause', id='commit') diff --git a/tests/qemu-iotests/224.out b/tests/qemu-iotests/224.out index 23374a1d29..287d2eac7a 100644 --- a/tests/qemu-iotests/224.out +++ b/tests/qemu-iotests/224.out @@ -3,7 +3,7 @@ {"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-base.img"}, "node-name": "base"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-mid.img"}, "node-name": "mid"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-top.img"}, "node-name": "top"}} {"return": {}} -{"execute": "block-commit", "arguments": {"base": "json:{\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}", "device": "top", "job-id": "commit", "speed": 1, "top": "json:{\"backing\": {\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-mid.img\"}}"}} +{"execute": "block-commit", "arguments": {"base": "json:{ /* filtered */ }", "device": "top", "job-id": "commit", "speed": 1, "top": "json:{ /* filtered */ }"}} {"return": {}} {"execute": "job-pause", "arguments": {"id": "commit"}} {"return": {}} @@ -12,7 +12,7 @@ {"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-base.img"}, "node-name": "base"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-mid.img"}, "node-name": "mid"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-top.img"}, "node-name": "top"}} {"return": {}} -{"execute": "block-commit", "arguments": {"base": "json:{\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}", "device": "top", "filter-node-name": "filter_node", "job-id": "commit", "speed": 1, "top": "json:{\"backing\": {\"backing\": {\"driver\": \"null-co\"}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-base.img\"}}, \"driver\": \"IMGFMT\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/PID-mid.img\"}}"}} +{"execute": "block-commit", "arguments": {"base": "json:{ /* filtered */ }", "device": "top", "filter-node-name": "filter_node", "job-id": "commit", "speed": 1, "top": "json:{ /* filtered */ }"}} {"return": {}} {"execute": "job-pause", "arguments": {"id": "commit"}} {"return": {}}