From nobody Sun May 4 07:04:05 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1588262866; cv=none;
d=zohomail.com; s=zohoarc;
b=YZokwUpVd/9hScl9s+4PfeyZEQ9nf0qR3zlwLf+1jfK6k+FtAilQXlm8KhcgqCdlcony2grGWMhyrcy4lHX8EgR/h8M5TY6WG7oZoS1PnFWiUlMK7F6yxPYV+bWXVuXdoGq2w0jVdH/bgrsSV/8RXV6qlTJ/fQ+YAuoPq1BRwy4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1588262866;
h=Content-Type: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;
bh=D/MnDYIfBECLV1XlZ0PWU5pHSgkSH8Syl74idUAwCQc=;
b=P0mjAHRZWKLtBGruR1c6WcFgoq9KAc/z5RN3AVGrQ6UQRe0PoBL9cY4p95wS7PPamEZS+WhQaKKfrz9SvRn5aAP+2AYTOsL52mEylcsLwPJir7FHyqGH/9ouhju1r8pu+T0fU4J1qog7V/j1766t7PPHn5M1oR77ZZwrzEEePHg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<kwolf@redhat.com> (p=none dis=none)
header.from=<kwolf@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1588262866989956.6555301372025;
Thu, 30 Apr 2020 09:07:46 -0700 (PDT)
Received: from localhost ([::1]:42374 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1jUBiz-0001ae-JO
for importer@patchew.org; Thu, 30 Apr 2020 12:07:45 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:44760)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <kwolf@redhat.com>) id 1jUBWu-0007pi-JX
for qemu-devel@nongnu.org; Thu, 30 Apr 2020 11:56:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1)
(envelope-from <kwolf@redhat.com>) id 1jUBUv-0003ik-A2
for qemu-devel@nongnu.org; Thu, 30 Apr 2020 11:55:16 -0400
Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37929
helo=us-smtp-delivery-1.mimecast.com)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1jUBUu-0003de-RP
for qemu-devel@nongnu.org; Thu, 30 Apr 2020 11:53:12 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-266-XquEFkv0NXWyB2pluXyO6w-1; Thu, 30 Apr 2020 11:53:09 -0400
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94ADD107ACCD;
Thu, 30 Apr 2020 15:53:08 +0000 (UTC)
Received: from linux.fritz.box.com (ovpn-114-60.ams2.redhat.com
[10.36.114.60])
by smtp.corp.redhat.com (Postfix) with ESMTP id 6E4C560C84;
Thu, 30 Apr 2020 15:53:07 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1588261991;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=D/MnDYIfBECLV1XlZ0PWU5pHSgkSH8Syl74idUAwCQc=;
b=BGtpRf9ZqvkQ18Wqrok2dGUTNsJdsbNF8VkTN3zcITTAaMYUhRd9qmZ0F337Eelw3TQ7ni
NMoa473YsnlaWCc/UQJaI8vUv6T2+YtC+qZNea7ji6pgbAS6ZT7NR/I+qkuQVAiVqgtlc9
3XAMhR/4XNk+cVOeKRQRRoL3pxlvahQ=
X-MC-Unique: XquEFkv0NXWyB2pluXyO6w-1
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Subject: [PULL 10/15] iotests: Filter testfiles out in filter_img_info()
Date: Thu, 30 Apr 2020 17:52:26 +0200
Message-Id: <20200430155231.473156-11-kwolf@redhat.com>
In-Reply-To: <20200430155231.473156-1-kwolf@redhat.com>
References: <20200430155231.473156-1-kwolf@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.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;
Received-SPF: pass client-ip=205.139.110.61; envelope-from=kwolf@redhat.com;
helo=us-smtp-delivery-1.mimecast.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 01:04:40
X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic]
X-Received-From: 205.139.110.61
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"
We want to keep TEST_IMG for the full path of the main test image, but
filter_testfiles() must be called for other test images before replacing
other things like the image format because the test directory path could
contain the format as a substring.
Insert a filter_testfiles() call between both.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200424125448.63318-9-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/iotests.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 7bc4934cd2..5f8c263d59 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -338,8 +338,9 @@ def filter_img_info(output, filename):
for line in output.split('\n'):
if 'disk size' in line or 'actual-size' in line:
continue
- line =3D line.replace(filename, 'TEST_IMG') \
- .replace(imgfmt, 'IMGFMT')
+ line =3D line.replace(filename, 'TEST_IMG')
+ line =3D filter_testfiles(line)
+ line =3D line.replace(imgfmt, 'IMGFMT')
line =3D re.sub('iters: [0-9]+', 'iters: XXX', line)
line =3D re.sub('uuid: [-a-f0-9]+', 'uuid: XXXXXXXX-XXXX-XXXX-XXXX=
-XXXXXXXXXXXX', line)
line =3D re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line)
--=20
2.25.3