Commit c3988519 authored by Peter Xu's avatar Peter Xu Committed by Eric Blake
Browse files

iotests: fix wait_until_completed() 



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: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180408030542.17855-1-peterx@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent fb4fe32d

tests/qemu-iotests/iotests.py

+3 −6
Original line number Diff line number Diff line
@@ -470,16 +470,13 @@ 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):

                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