Commit 977d26fd authored by John Snow's avatar John Snow Committed by Max Reitz
Browse files

tests/test-blockjob: remove exit callback 



We remove the exit callback and the completed boolean along with it.
We can simulate it just fine by waiting for the job to defer to the
main loop, and then giving it one final kick to get the main loop
portion to run.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20180906130225.5118-10-jsnow@redhat.com
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 0cc4643b

tests/test-blockjob.c

+6 −10
Original line number Diff line number Diff line
@@ -160,15 +160,8 @@ typedef struct CancelJob { 
    BlockBackend *blk;

    bool should_converge;

    bool should_complete;

    bool completed;

} CancelJob;



static void cancel_job_exit(Job *job)

{

    CancelJob *s = container_of(job, CancelJob, common.job);

    s->completed = true;

}



static void cancel_job_complete(Job *job, Error **errp)

{

    CancelJob *s = container_of(job, CancelJob, common.job);
@@ -201,7 +194,6 @@ static const BlockJobDriver test_cancel_driver = { 
        .user_resume   = block_job_user_resume,

        .drain         = block_job_drain,

        .run           = cancel_job_run,

        .exit          = cancel_job_exit,

        .complete      = cancel_job_complete,

    },

};
@@ -335,9 +327,11 @@ static void test_cancel_pending(void) 


    job_complete(job, &error_abort);

    job_enter(job);

    while (!s->completed) {

    while (!job->deferred_to_main_loop) {

        aio_poll(qemu_get_aio_context(), true);

    }

    assert(job->status == JOB_STATUS_READY);

    aio_poll(qemu_get_aio_context(), true);

    assert(job->status == JOB_STATUS_PENDING);



    cancel_common(s);
@@ -359,9 +353,11 @@ static void test_cancel_concluded(void) 


    job_complete(job, &error_abort);

    job_enter(job);

    while (!s->completed) {

    while (!job->deferred_to_main_loop) {

        aio_poll(qemu_get_aio_context(), true);

    }

    assert(job->status == JOB_STATUS_READY);

    aio_poll(qemu_get_aio_context(), true);

    assert(job->status == JOB_STATUS_PENDING);



    job_finalize(job, &error_abort);