From nobody Sat Sep 21 04:40:24 2024 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=1705589361; cv=none; d=zohomail.com; s=zohoarc; b=Z/VZ6z6EoD2PgA6J/AfWwtj5pU+4Rvrd5QZ4zVjXsQ2b25ssCEL3d5KX9bYT3Ps3jaNfZtkpRzljxd37mPho6wagGNzqNK5+pRfC2aDuC4KKZd1v6q6EWv7acgsDB6DxDQ1R+dkFUAT4mnbyIIKyus4dC/AkW/ZyC7HD2hh5Jr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705589361; 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=8gLDzkc7KKVNmxeppPypneb8/SdwIkB4+XfAka8zeSw=; b=B+g0XnCqeYLndcaambXiVm2dbINho7Sl9BFDMw7KLQACVo86GZkoS+l+a0//Vw4d6IzgQ7X3Uk3R9JrD34s9agGCyudhN6OgWz9RmZqczHc2qsjM770HhE0i1qeis7m3TodQ9X/NCeX9psPbWdEsIpEzgXz85+4KocOwz/Ilh/w= 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 1705589361865129.43037208978512; Thu, 18 Jan 2024 06:49:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQThJ-00062M-D6; Thu, 18 Jan 2024 09:48:50 -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 1rQTh7-0005vh-2g for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:48:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQTh3-0008IC-OT for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:48:35 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-70-TRsL-W4GPCaGpw9Hw2ixzA-1; Thu, 18 Jan 2024 09:48:28 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1F37D3C2AB09; Thu, 18 Jan 2024 14:48:28 +0000 (UTC) Received: from localhost (unknown [10.39.192.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4048200A2F4; Thu, 18 Jan 2024 14:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705589311; 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=8gLDzkc7KKVNmxeppPypneb8/SdwIkB4+XfAka8zeSw=; b=LYuwbKleFFXKtuWKzB/OZiQPfxOH0yb/1OJxm/Nf0GGCpqF5NGEutKGzdFsrMwE2qeiwFy iq7HiMiWPEJ+E09Es+oC9Seiqlc4OlIzF8JZQmn7kINrRWu/5h3yHLo/f5UKb64Z1J6x9w NDJK5GaYq9WajZ5OY1wlEm616NibRbs= X-MC-Unique: TRsL-W4GPCaGpw9Hw2ixzA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Paolo Bonzini , Fiona Ebner , Michael Roth , Markus Armbruster , , Hanna Reitz , Stefan Hajnoczi Subject: [PATCH v2 1/3] iotests: add filter_qmp_generated_node_ids() Date: Thu, 18 Jan 2024 09:48:21 -0500 Message-ID: <20240118144823.1497953-2-stefanha@redhat.com> In-Reply-To: <20240118144823.1497953-1-stefanha@redhat.com> References: <20240118144823.1497953-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1705589363690100003 Content-Type: text/plain; charset="utf-8" Add a filter function for QMP responses that contain QEMU's automatically generated node ids. The ids change between runs and must be masked in the reference output. The next commit will use this new function. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/iotests.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index e5c5798c71..ea48af4a7b 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -651,6 +651,13 @@ def _filter(_key, value): def filter_generated_node_ids(msg): return re.sub("#block[0-9]+", "NODE_NAME", msg) =20 +def filter_qmp_generated_node_ids(qmsg): + def _filter(_key, value): + if is_str(value): + return filter_generated_node_ids(value) + return value + return filter_qmp(qmsg, _filter) + def filter_img_info(output: str, filename: str, drop_child_info: bool =3D True) -> str: lines =3D [] --=20 2.43.0