From nobody Sat Apr 5 00:11:48 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=1739204074; cv=none; d=zohomail.com; s=zohoarc; b=ljMlknqwzo8oTdKo//GDOa4rFs8zgre/U6yxWHt0UzX/VGbwLMFTw71ZKEMIrrLcMIGPYOg2axO3DeLATPX00pJvAOQGU0vmc95OsWgXg9kKl3ckYNvjiBKZalBSUlbi2ba61rj2/GaM0XTvRmj1uLIm6JSBIMOWMW9qWyZarfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739204074; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8Q3Ehc+o47h/Exj+Aw/oOgObMFhIKRHdXWoGL3cVWOc=; b=dMheQ9MXyNFYvwkWxUmVdlhaLL1REI2Tr1megtsdNWZGenmiQakI4a2XmT0jhLCkea2BCKbT42WErUq2QJq04wN+M8cztejEhyPJppELAD+KZpKD7LGzAJ5z/Vek+XcgShUnQZgRd7sDYb5ps053gl3wOqmi8R/3Thb0j+yXaQ0= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739204074111684.4305067584341; Mon, 10 Feb 2025 08:14:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWOC-0006rp-0m; Mon, 10 Feb 2025 11:12:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWNu-0006hv-6v for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:11:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWNr-00018a-Pa for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:11:45 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-zsPI7DnSMDe_-s4eD6P4MA-1; Mon, 10 Feb 2025 11:11:41 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6068F19560A7; Mon, 10 Feb 2025 16:11:31 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.45.225.156]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BDD6195608D; Mon, 10 Feb 2025 16:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739203903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Q3Ehc+o47h/Exj+Aw/oOgObMFhIKRHdXWoGL3cVWOc=; b=TtkukvljDnn4EaqUtqXPRQ/yzfnkYM4pa59jUxPnkbE7s0UUq+TfhvIWHHjjSMl6yBT6/K CCh1BNIJ6GT5hNobwePCADkjbwPHRszyIeL7VDqppKjW9eYNqNDMqNPbFnWxtNsTBRFR0W BTTVed17gL7cnlusf6bub9Kp1JwrzOk= X-MC-Unique: zsPI7DnSMDe_-s4eD6P4MA-1 X-Mimecast-MFC-AGG-ID: zsPI7DnSMDe_-s4eD6P4MA From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 22/25] iotests: Add filter_qtest() Date: Mon, 10 Feb 2025 17:10:31 +0100 Message-ID: <20250210161034.76494-23-kwolf@redhat.com> In-Reply-To: <20250210161034.76494-1-kwolf@redhat.com> References: <20250210161034.76494-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.388, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739204075958019000 Content-Type: text/plain; charset="utf-8" The open-coded form of this filter has been copied into enough tests that it's better to move it into iotests.py. Signed-off-by: Kevin Wolf Acked-by: Fabiano Rosas Reviewed-by: Eric Blake Message-ID: <20250204211407.381505-15-kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- tests/qemu-iotests/iotests.py | 4 ++++ tests/qemu-iotests/041 | 4 +--- tests/qemu-iotests/165 | 4 +--- tests/qemu-iotests/tests/copy-before-write | 3 +-- tests/qemu-iotests/tests/migrate-bitmaps-test | 7 +++---- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 19817c7353..9c9c908983 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -701,6 +701,10 @@ def _filter(_key, value): def filter_nbd_exports(output: str) -> str: return re.sub(r'((min|opt|max) block): [0-9]+', r'\1: XXX', output) =20 +def filter_qtest(output: str) -> str: + output =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', output) + output =3D re.sub(r'\n?\[I \+\d+\.\d+\] CLOSED\n?$', '', output) + return output =20 Msg =3D TypeVar('Msg', Dict[str, Any], List[Any], str) =20 diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 98d17b1388..8452845f44 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -1100,10 +1100,8 @@ class TestRepairQuorum(iotests.QMPTestCase): =20 # Check the full error message now self.vm.shutdown() - log =3D self.vm.get_log() - log =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log) + log =3D iotests.filter_qtest(self.vm.get_log()) log =3D re.sub(r'^Formatting.*\n', '', log) - log =3D re.sub(r'\n\[I \+\d+\.\d+\] CLOSED\n?$', '', log) log =3D re.sub(r'^%s: ' % os.path.basename(iotests.qemu_prog), '',= log) =20 self.assertEqual(log, diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165 index b24907a62f..b3b1709d71 100755 --- a/tests/qemu-iotests/165 +++ b/tests/qemu-iotests/165 @@ -82,9 +82,7 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): self.vm.shutdown() =20 #catch 'Persistent bitmaps are lost' possible error - log =3D self.vm.get_log() - log =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log) - log =3D re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log) + log =3D iotests.filter_qtest(self.vm.get_log()) if log: print(log) =20 diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotest= s/tests/copy-before-write index d33bea577d..498c558008 100755 --- a/tests/qemu-iotests/tests/copy-before-write +++ b/tests/qemu-iotests/tests/copy-before-write @@ -95,8 +95,7 @@ class TestCbwError(iotests.QMPTestCase): =20 self.vm.shutdown() log =3D self.vm.get_log() - log =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log) - log =3D re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log) + log =3D iotests.filter_qtest(log) log =3D iotests.filter_qemu_io(log) return log =20 diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-test b/tests/qemu-iot= ests/tests/migrate-bitmaps-test index f98e721e97..8fb4099201 100755 --- a/tests/qemu-iotests/tests/migrate-bitmaps-test +++ b/tests/qemu-iotests/tests/migrate-bitmaps-test @@ -122,11 +122,10 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): =20 # catch 'Could not reopen qcow2 layer: Bitmap already exists' # possible error - log =3D self.vm_a.get_log() - log =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log) - log =3D re.sub(r'^(wrote .* bytes at offset .*\n.*KiB.*ops.*sec.*\= n){3}', + log =3D iotests.filter_qtest(self.vm_a.get_log()) + log =3D re.sub(r'^(wrote .* bytes at offset .*\n' + r'.*KiB.*ops.*sec.*\n?){3}', '', log) - log =3D re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log) self.assertEqual(log, '') =20 # test that bitmap is still persistent --=20 2.48.1