From nobody Mon Feb 9 02:13:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587569474; cv=none; d=zohomail.com; s=zohoarc; b=E8qCiiwEqAm7a+skv5z+JHWxnpJO0h/TH2LeeEiB79KY172Tu9+usSr0eAMmoVKxPkFAPvW7fp3tk2CCRf4z1zrHiZxuWJTEIlpbGAEuf+bWWVfIA5XofimMSo636LwcVuEHxFMuZFciIVuQLHRUoAZJdue22r0rKy8xCUZMgow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587569474; 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=qqZd/HVaOeeBz+/vOCl3MyS4lnG4rguVbRdy4rS6oQY=; b=iupbKW06aFX1mkMaO0iPAZvJuJ7GCqQdsZ4jnhnDB7CT9KBDyXCc1KK12y/XwrTvrDZJTcJ+mcfd1/cKlC4k1O7zcFJSaiupZFJieivBbD6PLBhXiXB9F8vpEgJMLJprMYbDSot/6vwZ+bP6Jauo2owhg6raLKEUQY+V068cWUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1587569474744353.9126757663212; Wed, 22 Apr 2020 08:31:14 -0700 (PDT) Received: from localhost ([::1]:52808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRHLF-0006kd-AF for importer@patchew.org; Wed, 22 Apr 2020 11:31:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35120) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRHCY-0003NW-RH for qemu-devel@nongnu.org; Wed, 22 Apr 2020 11:22:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRHCI-0003sO-La for qemu-devel@nongnu.org; Wed, 22 Apr 2020 11:22:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25989 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRHCI-0003no-3o for qemu-devel@nongnu.org; Wed, 22 Apr 2020 11:21:58 -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-258-oU76VLRJP22lrmzjs10pQQ-1; Wed, 22 Apr 2020 11:21:53 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0549A2F2B; Wed, 22 Apr 2020 15:21:52 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-212.ams2.redhat.com [10.36.114.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EBAB600D2; Wed, 22 Apr 2020 15:21:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587568915; 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=qqZd/HVaOeeBz+/vOCl3MyS4lnG4rguVbRdy4rS6oQY=; b=OkKQRBAqFf/JDwZ/C29+bRth0DjS4LSUeJpao7pIbwLyt2wWbXThHf0NnqvqpS1Ul1HuN9 nuHddu/Na60Gd/Rp1BLM2xEV0z3YtW35cRrnsctyjPuDBsOIchJ8d6dc3Y5nUHLljFeq+n U/PrMl+Urj6Cr9lKw7A/Shyzt8FJvMc= X-MC-Unique: oU76VLRJP22lrmzjs10pQQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH v5 8/9] iotests: Filter testfiles out in filter_img_info() Date: Wed, 22 Apr 2020 17:21:28 +0200 Message-Id: <20200422152129.167074-9-kwolf@redhat.com> In-Reply-To: <20200422152129.167074-1-kwolf@redhat.com> References: <20200422152129.167074-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 04:15:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: kwolf@redhat.com, vsementsov@virtuozzo.com, berto@igalia.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Reviewed-by: Max Reitz --- 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