diff options
| author | Fam Zheng <famz@redhat.com> | 2015-06-08 13:56:14 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-07-02 10:06:23 +0100 |
| commit | d7b25297920d18fa2a2cde1ed21fde38a88c935f (patch) | |
| tree | ababe22e2d05d0b98e6b903516549e7c1c404300 | |
| parent | c615091793f53ff33b8f6c1b1ba711cf7c93e97b (diff) | |
| download | qemu-d7b25297920d18fa2a2cde1ed21fde38a88c935f.zip qemu-d7b25297920d18fa2a2cde1ed21fde38a88c935f.tar.gz qemu-d7b25297920d18fa2a2cde1ed21fde38a88c935f.tar.bz2 | |
iotests: Use event_wait in wait_ready
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 <jsnow@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 9 |
1 files 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) |