[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 08/16] qemu-iotests: Add VM.run_job()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v2 08/16] qemu-iotests: Add VM.run_job() |
Date: |
Tue, 29 May 2018 22:39:02 +0200 |
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 <address@hidden>
---
tests/qemu-iotests/iotests.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
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'([^\[]+)\[([^\]]+)\]')
--
2.13.6
- [Qemu-block] [PATCH v2 00/16] block: Make blockdev-create a job and stable API, Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 02/16] vhdx: Fix vhdx_co_create() return value, Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 01/16] vdi: Fix vdi_co_do_create() return value, Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 04/16] block/create: Make x-blockdev-create a job, Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 03/16] job: Add error message for failing jobs, Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 05/16] qemu-iotests: Add VM.get_qmp_events_filtered(), Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 08/16] qemu-iotests: Add VM.run_job(),
Kevin Wolf <=
- [Qemu-block] [PATCH v2 07/16] qemu-iotests: Add iotests.img_info_log(), Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 09/16] qemu-iotests: iotests.py helper for non-file protocols, Kevin Wolf, 2018/05/29
- [Qemu-block] [PATCH v2 06/16] qemu-iotests: Add VM.qmp_log(), Kevin Wolf, 2018/05/29