vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests.py: Filters for VM.run_job() 

Allow filters for VM.run_job(), and pass the filters given to
VM.blockdev_create() to it.

(Use this opportunity to annotate VM.run_job()'s parameter types;
unfortunately, for the filter, I could not come up with anything better
than Callable[[Any], Any] that would pass mypy's scrutiny.)

At one point, a plain string is logged, so the filters passed to it must
work fine with plain strings.  The only filters passed to it at this
point are the ones from VM.blockdev_create(), which are
filter_qmp_test_files() (by default) and 207's filter_hash().  Both
cannot handle plain strings yet, but we can make them by amending
filter_qmp() to treat them as plain values with a None key.

Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220318125304.66131-2-hreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
master
Hanna Reitz 2022-03-18 13:53:03 +01:00
parent 8f685ac391
commit da9d88d8e6
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -607,8 +607,10 @@ def filter_qmp(qmsg, filter_fn):
# Iterate through either lists or dicts;
if isinstance(qmsg, list):
items = enumerate(qmsg)
else:
elif isinstance(qmsg, dict):
items = qmsg.items()
else:
return filter_fn(None, qmsg)
for k, v in items:
if isinstance(v, (dict, list)):
@ -944,8 +946,12 @@ class VM(qtest.QEMUQtestMachine):
return result
# Returns None on success, and an error string on failure
def run_job(self, job, auto_finalize=True, auto_dismiss=False,
pre_finalize=None, cancel=False, wait=60.0):
def run_job(self, job: str, auto_finalize: bool = True,
auto_dismiss: bool = False,
pre_finalize: Optional[Callable[[], None]] = None,
cancel: bool = False, wait: float = 60.0,
filters: Iterable[Callable[[Any], Any]] = (),
) -> Optional[str]:
"""
run_job moves a job from creation through to dismissal.
@ -975,7 +981,7 @@ class VM(qtest.QEMUQtestMachine):
while True:
ev = filter_qmp_event(self.events_wait(events, timeout=wait))
if ev['event'] != 'JOB_STATUS_CHANGE':
log(ev)
log(ev, filters=filters)
continue
status = ev['data']['status']
if status == 'aborting':
@ -983,18 +989,18 @@ class VM(qtest.QEMUQtestMachine):
for j in result['return']:
if j['id'] == job:
error = j['error']
log('Job failed: %s' % (j['error']))
log('Job failed: %s' % (j['error']), filters=filters)
elif status == 'ready':
self.qmp_log('job-complete', id=job)
self.qmp_log('job-complete', id=job, filters=filters)
elif status == 'pending' and not auto_finalize:
if pre_finalize:
pre_finalize()
if cancel:
self.qmp_log('job-cancel', id=job)
self.qmp_log('job-cancel', id=job, filters=filters)
else:
self.qmp_log('job-finalize', id=job)
self.qmp_log('job-finalize', id=job, filters=filters)
elif status == 'concluded' and not auto_dismiss:
self.qmp_log('job-dismiss', id=job)
self.qmp_log('job-dismiss', id=job, filters=filters)
elif status == 'null':
return error
@ -1007,7 +1013,7 @@ class VM(qtest.QEMUQtestMachine):
if 'return' in result:
assert result['return'] == {}
job_result = self.run_job(job_id)
job_result = self.run_job(job_id, filters=filters)
else:
job_result = result['error']