* [PATCH] iotests/iothreads-stream: Use the right TimeoutError
@ 2024-01-25 15:21 Kevin Wolf
2024-01-25 20:50 ` Stefan Hajnoczi
0 siblings, 1 reply; 2+ messages in thread
From: Kevin Wolf @ 2024-01-25 15:21 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, stefanha, peter.maydell, qemu-devel
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 <kwolf@redhat.com>
---
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 <kwolf@redhat.com>
+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.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iotests/iothreads-stream: Use the right TimeoutError
2024-01-25 15:21 [PATCH] iotests/iothreads-stream: Use the right TimeoutError Kevin Wolf
@ 2024-01-25 20:50 ` Stefan Hajnoczi
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hajnoczi @ 2024-01-25 20:50 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-block, peter.maydell, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
On Thu, Jan 25, 2024 at 04:21:50PM +0100, Kevin Wolf wrote:
> 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 <kwolf@redhat.com>
> ---
> tests/qemu-iotests/tests/iothreads-stream | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-29 13:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-25 15:21 [PATCH] iotests/iothreads-stream: Use the right TimeoutError Kevin Wolf
2024-01-25 20:50 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).