From nobody Mon Feb 9 08:57:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569960697; cv=none; d=zoho.com; s=zohoarc; b=UP68VJ+goBtNczI77oTr5K7qKTVPBkTYQe+TJq1L1WBPZ9NImy+7XbKqz3vmFikjq5JBd/sPOjJvB+3Q28HTyBpp79rKaN2jEQMZjxht1UOCj/wQafArEQidRSvKzmJ7F1Oi7VhvcnBPQ3ErtFRJcAQlOSmXjTMZOJS4hKtDHwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569960697; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=o4k1Zd5xt6aksViPAiDGGK/Sf1yveHNMfYJ2wj5G+mM=; b=L4al0Cesv2lp0ckw6v9PmTl60RtLNhBtWwb/YRDUv1lnlN3ofhm0m9YXpKvjBcUnK1xwxtGBYjUC/NKNgByspcmrliFqbu1JkXSBzkYeekFW2gDwYadhqZDDskXP1EYV3a3wwgdSafLJwaWnGuWoXOM+sHoIgjDLzO/SXLFmgE8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569960697513506.33439394464017; Tue, 1 Oct 2019 13:11:37 -0700 (PDT) Received: from localhost ([::1]:47724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFOUh-0008VY-Dk for importer@patchew.org; Tue, 01 Oct 2019 16:11:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54040) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO7k-0004WU-Kn for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO7g-0007lG-OG for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60068) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO7U-0007fR-Rn; Tue, 01 Oct 2019 15:47:37 -0400 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 5E28410DCC98; Tue, 1 Oct 2019 19:47:34 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EDA9C6012C; Tue, 1 Oct 2019 19:47:33 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 07/67] iotests.py: Filter data_file in filter_img_info Date: Tue, 1 Oct 2019 21:46:15 +0200 Message-Id: <20191001194715.2796-8-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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Tue, 01 Oct 2019 19:47:34 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If $IMGOPTS contains a data_file reference, let filter_img_info filter all data_file information. Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 280e6c2ec2..fb0a49372d 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -380,9 +380,13 @@ def filter_generated_node_ids(msg): =20 def filter_img_info(output, filename): lines =3D [] + user_data_file =3D any('data_file' in opt for opt in imgopts) for line in output.split('\n'): if 'disk size' in line or 'actual-size' in line: continue + if user_data_file: + if 'data file' in line: + continue line =3D line.replace(filename, 'TEST_IMG') \ .replace(imgfmt, 'IMGFMT') line =3D re.sub('iters: [0-9]+', 'iters: XXX', line) --=20 2.21.0