Commit d6a79af0 authored by John Snow's avatar John Snow Committed by Max Reitz
Browse files

iotests.py: rewrite run_job to be pickier 



Don't pull events out of the queue that don't belong to us;
be choosier so that we can use this method to drive jobs that
were launched by transactions that may have more jobs.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20190523170643.20794-5-jsnow@redhat.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent f6f4b3f0

tests/qemu-iotests/iotests.py

+29 −19
Original line number Diff line number Diff line
@@ -543,10 +543,22 @@ class VM(qtest.QEMUQtestMachine): 
    # Returns None on success, and an error string on failure

    def run_job(self, job, auto_finalize=True, auto_dismiss=False,

                pre_finalize=None, wait=60.0):

        match_device = {'data': {'device': job}}

        match_id = {'data': {'id': job}}

        events = [

            ('BLOCK_JOB_COMPLETED', match_device),

            ('BLOCK_JOB_CANCELLED', match_device),

            ('BLOCK_JOB_ERROR', match_device),

            ('BLOCK_JOB_READY', match_device),

            ('BLOCK_JOB_PENDING', match_id),

            ('JOB_STATUS_CHANGE', match_id)

        ]

        error = None

        while True:

            for ev in self.get_qmp_events_filtered(wait=wait):

                if ev['event'] == 'JOB_STATUS_CHANGE':

            ev = filter_qmp_event(self.events_wait(events))

            if ev['event'] != 'JOB_STATUS_CHANGE':

                log(ev)

                continue

            status = ev['data']['status']

            if status == 'aborting':

                result = self.qmp('query-jobs')
@@ -562,8 +574,6 @@ class VM(qtest.QEMUQtestMachine): 
                self.qmp_log('job-dismiss', id=job)

            elif status == 'null':

                return error

                else:

                    log(ev)



    def node_info(self, node_name):

        nodes = self.qmp('query-named-block-nodes')