aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2019-11-19 18:37:06 +0100
committerKevin Wolf <kwolf@redhat.com>2019-12-18 11:21:16 +0100
commit55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39 (patch)
treefb931b094e2547993f8106db667584856110d3af /tests
parenta96f0350e3d95c98f2bff1863d14493af5c1d360 (diff)
downloadqemu-55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39.zip
qemu-55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39.tar.gz
qemu-55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39.tar.bz2
iotests: Fix timeout in run_job()
run_job() accepts a wait parameter for a timeout, but it doesn't actually use it. The only thing that is missing is passing it to events_wait(), so do that now. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qemu-iotests/iotests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index fc78852..0ac3ad4 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -609,7 +609,7 @@ class VM(qtest.QEMUQtestMachine):
]
error = None
while True:
- ev = filter_qmp_event(self.events_wait(events))
+ ev = filter_qmp_event(self.events_wait(events, timeout=wait))
if ev['event'] != 'JOB_STATUS_CHANGE':
if use_log:
log(ev)