On 04/07/2018 10:05 PM, Peter Xu wrote: > If there are more than one events, wait_until_completed() might return > the 2nd event even if the 1st event is JOB_COMPLETED, since the for loop > will continue to run even if completed is set to True. > > It never happened before, but it can be triggered when OOB is enabled > due to the RESUME startup message. Fix that up. > > Signed-off-by: Peter Xu <pet...@redhat.com> > --- > tests/qemu-iotests/iotests.py | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-)
If you get the other OOB-related bug fixes working, I can include this along with those for -rc3 through the qapi tree. Otherwise, I'm fine waiting for this until 2.13. > +++ b/tests/qemu-iotests/iotests.py > @@ -470,18 +470,15 @@ class QMPTestCase(unittest.TestCase): > > def wait_until_completed(self, drive='drive0', check_offset=True): > '''Wait for a block job to finish, returning the event''' > - completed = False > - while not completed: > + while True: > for event in self.vm.get_qmp_events(wait=True): Do we really need two loops? Or can you eliminate the 'while True:' loop and rely on just the 'for event...' loop? > if event['event'] == 'BLOCK_JOB_COMPLETED': > self.assert_qmp(event, 'data/device', drive) > self.assert_qmp_absent(event, 'data/error') > if check_offset: > self.assert_qmp(event, 'data/offset', > event['data']['len']) > - completed = True > - > - self.assert_no_active_block_jobs() > - return event > + self.assert_no_active_block_jobs() > + return event > > def wait_ready(self, drive='drive0'): > '''Wait until a block job BLOCK_JOB_READY event''' > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature