From: Jeff Cody <jcody@redhat.com>
To: John Snow <jsnow@redhat.com>
Cc: qemu-block@nongnu.org, qemu-devel@nongnu.org,
Kevin Wolf <kwolf@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Eric Blake <eblake@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v5 08/16] tests/blockjob: replace Blockjob with Job
Date: Thu, 6 Sep 2018 12:58:26 -0400 [thread overview]
Message-ID: <20180906165826.GF22117@localhost.localdomain> (raw)
In-Reply-To: <20180906130225.5118-9-jsnow@redhat.com>
On Thu, Sep 06, 2018 at 09:02:17AM -0400, John Snow wrote:
> These tests don't actually test blockjobs anymore, they test
> generic Job lifetimes. Change the types accordingly.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
> ---
> tests/test-blockjob.c | 98 ++++++++++++++++++++++++++-------------------------
> 1 file changed, 50 insertions(+), 48 deletions(-)
>
> diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c
> index ad4a65bc78..8e8b680416 100644
> --- a/tests/test-blockjob.c
> +++ b/tests/test-blockjob.c
> @@ -206,18 +206,20 @@ static const BlockJobDriver test_cancel_driver = {
> },
> };
>
> -static CancelJob *create_common(BlockJob **pjob)
> +static CancelJob *create_common(Job **pjob)
> {
> BlockBackend *blk;
> - BlockJob *job;
> + Job *job;
> + BlockJob *bjob;
> CancelJob *s;
>
> blk = create_blk(NULL);
> - job = mk_job(blk, "Steve", &test_cancel_driver, true,
> - JOB_MANUAL_FINALIZE | JOB_MANUAL_DISMISS);
> - job_ref(&job->job);
> - assert(job->job.status == JOB_STATUS_CREATED);
> - s = container_of(job, CancelJob, common);
> + bjob = mk_job(blk, "Steve", &test_cancel_driver, true,
> + JOB_MANUAL_FINALIZE | JOB_MANUAL_DISMISS);
> + job = &bjob->job;
> + job_ref(job);
> + assert(job->status == JOB_STATUS_CREATED);
> + s = container_of(bjob, CancelJob, common);
> s->blk = blk;
>
> *pjob = job;
> @@ -242,7 +244,7 @@ static void cancel_common(CancelJob *s)
>
> static void test_cancel_created(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
> @@ -251,119 +253,119 @@ static void test_cancel_created(void)
>
> static void test_cancel_running(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
>
> - job_start(&job->job);
> - assert(job->job.status == JOB_STATUS_RUNNING);
> + job_start(job);
> + assert(job->status == JOB_STATUS_RUNNING);
>
> cancel_common(s);
> }
>
> static void test_cancel_paused(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
>
> - job_start(&job->job);
> - assert(job->job.status == JOB_STATUS_RUNNING);
> + job_start(job);
> + assert(job->status == JOB_STATUS_RUNNING);
>
> - job_user_pause(&job->job, &error_abort);
> - job_enter(&job->job);
> - assert(job->job.status == JOB_STATUS_PAUSED);
> + job_user_pause(job, &error_abort);
> + job_enter(job);
> + assert(job->status == JOB_STATUS_PAUSED);
>
> cancel_common(s);
> }
>
> static void test_cancel_ready(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
>
> - job_start(&job->job);
> - assert(job->job.status == JOB_STATUS_RUNNING);
> + job_start(job);
> + assert(job->status == JOB_STATUS_RUNNING);
>
> s->should_converge = true;
> - job_enter(&job->job);
> - assert(job->job.status == JOB_STATUS_READY);
> + job_enter(job);
> + assert(job->status == JOB_STATUS_READY);
>
> cancel_common(s);
> }
>
> static void test_cancel_standby(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
>
> - job_start(&job->job);
> - assert(job->job.status == JOB_STATUS_RUNNING);
> + job_start(job);
> + assert(job->status == JOB_STATUS_RUNNING);
>
> s->should_converge = true;
> - job_enter(&job->job);
> - assert(job->job.status == JOB_STATUS_READY);
> + job_enter(job);
> + assert(job->status == JOB_STATUS_READY);
>
> - job_user_pause(&job->job, &error_abort);
> - job_enter(&job->job);
> - assert(job->job.status == JOB_STATUS_STANDBY);
> + job_user_pause(job, &error_abort);
> + job_enter(job);
> + assert(job->status == JOB_STATUS_STANDBY);
>
> cancel_common(s);
> }
>
> static void test_cancel_pending(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
>
> - job_start(&job->job);
> - assert(job->job.status == JOB_STATUS_RUNNING);
> + job_start(job);
> + assert(job->status == JOB_STATUS_RUNNING);
>
> s->should_converge = true;
> - job_enter(&job->job);
> - assert(job->job.status == JOB_STATUS_READY);
> + job_enter(job);
> + assert(job->status == JOB_STATUS_READY);
>
> - job_complete(&job->job, &error_abort);
> - job_enter(&job->job);
> + job_complete(job, &error_abort);
> + job_enter(job);
> while (!s->completed) {
> aio_poll(qemu_get_aio_context(), true);
> }
> - assert(job->job.status == JOB_STATUS_PENDING);
> + assert(job->status == JOB_STATUS_PENDING);
>
> cancel_common(s);
> }
>
> static void test_cancel_concluded(void)
> {
> - BlockJob *job;
> + Job *job;
> CancelJob *s;
>
> s = create_common(&job);
>
> - job_start(&job->job);
> - assert(job->job.status == JOB_STATUS_RUNNING);
> + job_start(job);
> + assert(job->status == JOB_STATUS_RUNNING);
>
> s->should_converge = true;
> - job_enter(&job->job);
> - assert(job->job.status == JOB_STATUS_READY);
> + job_enter(job);
> + assert(job->status == JOB_STATUS_READY);
>
> - job_complete(&job->job, &error_abort);
> - job_enter(&job->job);
> + job_complete(job, &error_abort);
> + job_enter(job);
> while (!s->completed) {
> aio_poll(qemu_get_aio_context(), true);
> }
> - assert(job->job.status == JOB_STATUS_PENDING);
> + assert(job->status == JOB_STATUS_PENDING);
>
> - job_finalize(&job->job, &error_abort);
> - assert(job->job.status == JOB_STATUS_CONCLUDED);
> + job_finalize(job, &error_abort);
> + assert(job->status == JOB_STATUS_CONCLUDED);
>
> cancel_common(s);
> }
> --
> 2.14.4
>
next prev parent reply other threads:[~2018-09-06 16:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 13:02 [Qemu-devel] [PATCH v5 00/16] jobs: Job Exit Refactoring Pt 2 John Snow
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 01/16] block/commit: add block job creation flags John Snow
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 02/16] block/mirror: " John Snow
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 03/16] block/stream: " John Snow
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 04/16] block/commit: refactor commit to use job callbacks John Snow
2018-09-06 16:19 ` Jeff Cody
2018-09-07 23:14 ` Max Reitz
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 05/16] block/mirror: don't install backing chain on abort John Snow
2018-09-06 16:21 ` Jeff Cody
2018-09-07 23:15 ` Max Reitz
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 06/16] block/mirror: conservative mirror_exit refactor John Snow
2018-09-06 16:57 ` Jeff Cody
2018-09-06 20:31 ` John Snow
2018-09-07 23:16 ` Max Reitz
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 07/16] block/stream: refactor stream to use job callbacks John Snow
2018-09-06 16:58 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 08/16] tests/blockjob: replace Blockjob with Job John Snow
2018-09-06 16:58 ` Jeff Cody [this message]
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 09/16] tests/test-blockjob: remove exit callback John Snow
2018-09-06 16:58 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 10/16] tests/test-blockjob-txn: move .exit to .clean John Snow
2018-09-06 16:58 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 11/16] jobs: remove .exit callback John Snow
2018-09-06 16:59 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 12/16] qapi/block-commit: expose new job properties John Snow
2018-09-06 17:01 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 13/16] qapi/block-mirror: " John Snow
2018-09-06 17:01 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 14/16] qapi/block-stream: " John Snow
2018-09-06 17:02 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 15/16] block/backup: qapi documentation fixup John Snow
2018-09-06 17:03 ` Jeff Cody
2018-09-06 13:02 ` [Qemu-devel] [PATCH v5 16/16] blockdev: document transactional shortcomings John Snow
2018-09-06 17:03 ` Jeff Cody
2018-09-07 23:23 ` Max Reitz
2018-09-07 23:29 ` [Qemu-devel] [PATCH v5 00/16] jobs: Job Exit Refactoring Pt 2 Max Reitz
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=20180906165826.GF22117@localhost.localdomain \
--to=jcody@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jsnow@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).