From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1wsV-0003v2-VZ for qemu-devel@nongnu.org; Mon, 08 Jun 2015 09:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1wsQ-0006Gz-Tu for qemu-devel@nongnu.org; Mon, 08 Jun 2015 09:14:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1wlK-0002yZ-Pp for qemu-devel@nongnu.org; Mon, 08 Jun 2015 09:06:46 -0400 From: Stefan Hajnoczi Date: Mon, 8 Jun 2015 14:06:25 +0100 Message-Id: <1433768785-19413-10-git-send-email-stefanha@redhat.com> In-Reply-To: <1433768785-19413-1-git-send-email-stefanha@redhat.com> References: <1433768785-19413-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL v2 9/9] iotests: Use event_wait in wait_ready List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng Only poll the specific type of event we are interested in, to avoid stealing events that should be consumed by someone else. Suggested-by: John Snow Signed-off-by: Fam Zheng Reviewed-by: John Snow Message-id: 1433742974-20128-9-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/iotests.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 63de726..8615b10 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -328,13 +328,8 @@ class QMPTestCase(unittest.TestCase): def wait_ready(self, drive='drive0'): '''Wait until a block job BLOCK_JOB_READY event''' - ready = False - while not ready: - for event in self.vm.get_qmp_events(wait=True): - if event['event'] == 'BLOCK_JOB_READY': - self.assert_qmp(event, 'data/type', 'mirror') - self.assert_qmp(event, 'data/device', drive) - ready = True + f = {'data': {'type': 'mirror', 'device': drive } } + event = self.vm.event_wait(name='BLOCK_JOB_READY', match=f) def wait_ready_and_cancel(self, drive='drive0'): self.wait_ready(drive=drive) -- 2.4.2