]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
iotests/iothreads-stream: Use the right TimeoutError
authorKevin Wolf <kwolf@redhat.com>
Thu, 25 Jan 2024 15:21:50 +0000 (16:21 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 26 Jan 2024 11:26:35 +0000 (12:26 +0100)
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>
Message-ID: <20240125152150.42389-1-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tests/qemu-iotests/tests/iothreads-stream

index 503f221f16dc8588796a216059bae77beebaa82f..231195b5e87e87e35bfa5d84f96c1ce52af02d6f 100755 (executable)
@@ -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')