OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

iotests: Add @use_log to VM.run_job()

Browse Source 
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: Max Reitz <mreitz@redhat.com>
Message-id: 20190703172813.6868-10-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-07-03 19:28:10 +02:00
parent 3f92d54c00
commit 15427f63bc
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/qemu-iotests/iotests.py
View File

@ -542,7 +542,7 @@ class VM(qtest.QEMUQtestMachine):
# Returns None on success, and an error string on failure # Returns None on success, and an error string on failure
def run_job(self, job, auto_finalize=True, auto_dismiss=False, 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_device = {'data': {'device': job}}
match_id = {'data': {'id': job}} match_id = {'data': {'id': job}}
events = [ events = [
@ -557,6 +557,7 @@ class VM(qtest.QEMUQtestMachine):
while True: while True:
ev = filter_qmp_event(self.events_wait(events)) ev = filter_qmp_event(self.events_wait(events))
if ev['event'] != 'JOB_STATUS_CHANGE': if ev['event'] != 'JOB_STATUS_CHANGE':
if use_log:
log(ev) log(ev)
continue continue
status = ev['data']['status'] status = ev['data']['status']
@ -565,13 +566,20 @@ class VM(qtest.QEMUQtestMachine):
for j in result['return']: for j in result['return']:
if j['id'] == job: if j['id'] == job:
error = j['error'] error = j['error']
if use_log:
log('Job failed: %s' % (j['error'])) log('Job failed: %s' % (j['error']))
elif status == 'pending' and not auto_finalize: elif status == 'pending' and not auto_finalize:
if pre_finalize: if pre_finalize:
pre_finalize() pre_finalize()
if use_log:
self.qmp_log('job-finalize', id=job) self.qmp_log('job-finalize', id=job)
else:
self.qmp('job-finalize', id=job)
elif status == 'concluded' and not auto_dismiss: elif status == 'concluded' and not auto_dismiss:
if use_log:
self.qmp_log('job-dismiss', id=job) self.qmp_log('job-dismiss', id=job)
else:
self.qmp('job-dismiss', id=job)
elif status == 'null': elif status == 'null':
return error return error