From nobody Tue Nov 26 14:26:39 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=1706196177; cv=none; d=zohomail.com; s=zohoarc; b=Kfu9liyof20JnC2TwJZCcP96xquMwYMMWj7OHJXMqY7H/AuG85LwM7qpJwOMResGiVEzrUxgjtWla9xbIPStE7xTpUfUpQwWCTMyRcudvEAaPE5rs23sPn46LpNuxaL+kivPwEPYXqTOUPwGHMQ8rBTJWtJRyPCR1phdAYjfmzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706196177; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=S0cVTuBTyXzld7x1iW7DlhQfLLP+UdE6Aa1+QGSRg7k=; b=WvS4thuaMyrhPeSqELCvap/RzAjy1WsF5QOMAKbBFgMPkLgaPos0anVJcYJPf9pJaxaSGDFFxdQ4lhioaLGV8pQAudGp7vL766Q4liHVXGXpQyBzONyuS0pAqmdTigd7iZJGUZJ9yCRWSmt8zTt3XZxiU5GD889ZWOQa4/weEKc= 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 1706196177221907.2009068832485; Thu, 25 Jan 2024 07:22:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT1YK-0004Ou-FK; Thu, 25 Jan 2024 10:22: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 1rT1YJ-0004Of-MS for qemu-devel@nongnu.org; Thu, 25 Jan 2024 10:22:03 -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 1rT1YI-0007FO-0r for qemu-devel@nongnu.org; Thu, 25 Jan 2024 10:22:03 -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-341-g89eusZAN06uvVn80NS5pw-1; Thu, 25 Jan 2024 10:21:56 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 4341D3C1494B; Thu, 25 Jan 2024 15:21:56 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.194.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C7F7492BC6; Thu, 25 Jan 2024 15:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706196120; 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; bh=S0cVTuBTyXzld7x1iW7DlhQfLLP+UdE6Aa1+QGSRg7k=; b=Ad0cAF7GJBEIxWFrj++BctS6eXx74I/lEQ0vD5QyjV3LLoF18SCl3SAPfuts8Ai4O20e6z iLR8qS0WlgbmrM2YlYy3zZ/8VeCKDMubxU/YBcGMfoSqNCjzVJ3q14PJuGdItemdixuOKe pIFQOSQSJ+oaHwoKKMaU2XZ/+fJAfos= X-MC-Unique: g89eusZAN06uvVn80NS5pw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PATCH] iotests/iothreads-stream: Use the right TimeoutError Date: Thu, 25 Jan 2024 16:21:50 +0100 Message-ID: <20240125152150.42389-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.5, 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_H4=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: 1706196179403100003 Content-Type: text/plain; charset="utf-8" Since Python 3.11 asyncio.TimeoutError is an alias for TimeoutError, but in older versions it's not. We really have to catch asyncio.TimeoutError here, otherwise a slow test run will fail (as has happened multiple times on CI recently). Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/tests/iothreads-stream | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/tests/iothreads-stream b/tests/qemu-iotests= /tests/iothreads-stream index 503f221f16..231195b5e8 100755 --- a/tests/qemu-iotests/tests/iothreads-stream +++ b/tests/qemu-iotests/tests/iothreads-stream @@ -18,6 +18,7 @@ # # Creator/Owner: Kevin Wolf =20 +import asyncio import iotests =20 iotests.script_initialize(supported_fmts=3D['qcow2'], @@ -69,6 +70,6 @@ with iotests.FilePath('disk1.img') as base1_path, \ # The test is done once both jobs are gone if finished =3D=3D 2: break - except TimeoutError: + except asyncio.TimeoutError: pass vm.cmd('query-jobs') --=20 2.43.0