From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 19 Nov 2019 17:37:06 +0000 (+0100)
Subject: iotests: Fix timeout in run_job()
X-Git-Tag: v5.0.0-rc0~171^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39;p=thirdparty%2Fqemu.git

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>
---

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index fc78852ae58..0ac3ad4b040 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)