summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests
diff options
context:
space:
mode:
authorKevin Wolf2018-05-29 20:52:57 +0200
committerKevin Wolf2018-05-30 13:31:14 +0200
commitfc47d8513b45b1968b0ae32d4bb2f96d3aca066a (patch)
tree2a0a6fb6f774b73949be28846a59c8070f35bc4c /tests/qemu-iotests
parentqemu-iotests: Add iotests.img_info_log() (diff)
downloadqemu-fc47d8513b45b1968b0ae32d4bb2f96d3aca066a.tar.gz
qemu-fc47d8513b45b1968b0ae32d4bb2f96d3aca066a.tar.xz
qemu-fc47d8513b45b1968b0ae32d4bb2f96d3aca066a.zip
qemu-iotests: Add VM.run_job()
Add an iotests.py function that runs a job and only returns when it is destroyed. An error is logged when the job failed and job-finalize and job-dismiss commands are issued if necessary. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
-rw-r--r--tests/qemu-iotests/iotests.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index edcd2bb701..8b612cb891 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -418,6 +418,25 @@ class VM(qtest.QEMUQtestMachine):
log(str(result), filters)
return result
+ def run_job(self, job, auto_finalize=True, auto_dismiss=False):
+ while True:
+ for ev in self.get_qmp_events_filtered(wait=True):
+ if ev['event'] == 'JOB_STATUS_CHANGE':
+ status = ev['data']['status']
+ if status == 'aborting':
+ result = self.qmp('query-jobs')
+ for j in result['return']:
+ if j['id'] == job:
+ log('Job failed: %s' % (j['error']))
+ elif status == 'pending' and not auto_finalize:
+ self.qmp_log('job-finalize', id=job)
+ elif status == 'concluded' and not auto_dismiss:
+ self.qmp_log('job-dismiss', id=job)
+ elif status == 'null':
+ return
+ else:
+ iotests.log(ev)
+
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')