From 453da839a7d81896d03b827a95c1991a60740dc5 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 25 Jan 2024 16:21:50 +0100 Subject: [PATCH 21/22] iotests/iothreads-stream: Use the right TimeoutError RH-Author: Stefan Hajnoczi RH-MergeRequest: 219: virtio-blk: add iothread-vq-mapping parameter RH-Jira: RHEL-17369 RHEL-20764 RHEL-7356 RH-Acked-by: Kevin Wolf RH-Acked-by: Hanna Czenczek RH-Commit: [17/17] ca5a512ccccb668089b726d7499562d1e294c828 (stefanha/centos-stream-qemu-kvm) 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 Message-ID: <20240125152150.42389-1-kwolf@redhat.com> Signed-off-by: Kevin Wolf (cherry picked from commit c9c0b37ff4c11b712b21efabe8e5381d223d0295) Signed-off-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 +import asyncio import iotests iotests.script_initialize(supported_fmts=['qcow2'], @@ -69,6 +70,6 @@ with iotests.FilePath('disk1.img') as base1_path, \ # The test is done once both jobs are gone if finished == 2: break - except TimeoutError: + except asyncio.TimeoutError: pass vm.cmd('query-jobs') -- 2.39.3