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>
---
 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

On Tue, May 29, 2018 at 10:39:02PM +0200, Kevin Wolf wrote:
> 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: Jeff Cody <jcody@redhat.com>

> ---
>  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
> 

On 2018-05-29 22:39, Kevin Wolf wrote:
> 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>
> ---
>  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'([^\[]+)\[([^\]]+)\]')

No, I won't mention that I just realized you could get the job ID from
the event and don't actually need it as a parameter.

So without any comments:

Reviewed-by: Max Reitz <mreitz@redhat.com>