From: John Snow <jsnow@redhat.com>
To: Max Reitz <mreitz@redhat.com>, qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>,
Alberto Garcia <berto@igalia.com>,
qemu-devel@nongnu.org, Cleber Rosa <crosa@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 4/5] iotests: Add @use_log to VM.run_job()
Date: Mon, 1 Jul 2019 18:59:25 -0400 [thread overview]
Message-ID: <6f5eb9ac-c56f-943f-698f-38ec7726143d@redhat.com> (raw)
In-Reply-To: <20190627223255.3789-5-mreitz@redhat.com>
On 6/27/19 6:32 PM, Max Reitz wrote:
> 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>
Wondering out loud:
can log() (and by extension qmp_log, and run_job) be made to use the
python logging module and we can configure the logging environment
instead of bespoke arguments to avoid ever engaging the log?
We could theoretically just pre-disable iotests log output for unittest
style tests, unless you run in debug mode where we allow it.
I don't have a specific proposal for how to accomplish this, I think
there are some nuances to Python logging that I don't quite understand.
Maybe Cleber Rosa can help advise?
I'd like to toy with this idea; it seems like this won't be the last
time we want to turn output on/off.
--js
> ---
> tests/qemu-iotests/iotests.py | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 3ecef5bc90..ce74177ab1 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -542,7 +542,7 @@ class VM(qtest.QEMUQtestMachine):
>
> # Returns None on success, and an error string on failure
> 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_id = {'data': {'id': job}}
> events = [
> @@ -557,7 +557,8 @@ class VM(qtest.QEMUQtestMachine):
> while True:
> ev = filter_qmp_event(self.events_wait(events))
> if ev['event'] != 'JOB_STATUS_CHANGE':
> - log(ev)
> + if use_log:
> + log(ev)
> continue
> status = ev['data']['status']
> if status == 'aborting':
> @@ -565,13 +566,20 @@ class VM(qtest.QEMUQtestMachine):
> for j in result['return']:
> if j['id'] == job:
> error = j['error']
> - log('Job failed: %s' % (j['error']))
> + if use_log:
> + log('Job failed: %s' % (j['error']))
> elif status == 'pending' and not auto_finalize:
> if pre_finalize:
> pre_finalize()
> - self.qmp_log('job-finalize', id=job)
> + if use_log:
> + self.qmp_log('job-finalize', id=job)
> + else:
> + self.qmp('job-finalize', id=job)
> elif status == 'concluded' and not auto_dismiss:
> - self.qmp_log('job-dismiss', id=job)
> + if use_log:
> + self.qmp_log('job-dismiss', id=job)
> + else:
> + self.qmp('job-dismiss', id=job)
> elif status == 'null':
> return error
>
>
next prev parent reply other threads:[~2019-07-02 2:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 22:32 [Qemu-devel] [PATCH 0/5] block: Add BDS.never_freeze Max Reitz
2019-06-27 22:32 ` [Qemu-devel] [PATCH 1/5] " Max Reitz
2019-07-01 16:46 ` Andrey Shinkevich
2019-07-02 14:02 ` Alberto Garcia
2019-07-02 15:28 ` Max Reitz
2019-07-02 15:36 ` Alberto Garcia
2019-07-02 15:38 ` Max Reitz
2019-06-27 22:32 ` [Qemu-devel] [PATCH 2/5] iotests: Fix throttling in 030 Max Reitz
2019-07-01 16:41 ` Andrey Shinkevich
2019-07-02 15:09 ` Alberto Garcia
2019-06-27 22:32 ` [Qemu-devel] [PATCH 3/5] iotests: Compare error messages " Max Reitz
2019-07-01 16:42 ` Andrey Shinkevich
2019-07-02 12:37 ` Alberto Garcia
2019-06-27 22:32 ` [Qemu-devel] [PATCH 4/5] iotests: Add @use_log to VM.run_job() Max Reitz
2019-07-01 22:59 ` John Snow [this message]
2019-07-02 16:19 ` Max Reitz
2019-07-02 20:21 ` John Snow
2019-06-27 22:32 ` [Qemu-devel] [PATCH 5/5] iotests: Add new case to 030 Max Reitz
2019-07-01 16:44 ` Andrey Shinkevich
2019-07-02 14:59 ` Alberto Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6f5eb9ac-c56f-943f-698f-38ec7726143d@redhat.com \
--to=jsnow@redhat.com \
--cc=andrey.shinkevich@virtuozzo.com \
--cc=berto@igalia.com \
--cc=crosa@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).