Commit 15427f63 authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Add @use_log to VM.run_job() 



unittest-style tests generally do not use the log file, but VM.run_job()
can still be useful to them.  Add a parameter to it that hides its
output from the log file.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20190703172813.6868-10-mreitz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 3f92d54c

tests/qemu-iotests/iotests.py

+13 −5
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ 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):

                pre_finalize=None, use_log=True, wait=60.0):

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

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

        events = [
@@ -557,6 +557,7 @@ class VM(qtest.QEMUQtestMachine): 
        while True:

            ev = filter_qmp_event(self.events_wait(events))

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

                if use_log:

                    log(ev)

                continue

            status = ev['data']['status']
@@ -565,13 +566,20 @@ class VM(qtest.QEMUQtestMachine): 
                for j in result['return']:

                    if j['id'] == job:

                        error = j['error']

                        if use_log:

                            log('Job failed: %s' % (j['error']))

            elif status == 'pending' and not auto_finalize:

                if pre_finalize:

                    pre_finalize()

                if use_log:

                    self.qmp_log('job-finalize', id=job)

                else:

                    self.qmp('job-finalize', id=job)

            elif status == 'concluded' and not auto_dismiss:

                if use_log:

                    self.qmp_log('job-dismiss', id=job)

                else:

                    self.qmp('job-dismiss', id=job)

            elif status == 'null':

                return error