Commit d185cf0e authored by Kevin Wolf's avatar Kevin Wolf
Browse files

tests: Use opened block node for block job tests 



blk_insert_bs() and block job related functions will soon require an
opened block node (permission calculations will involve the block
driver), so let our tests be consistent with the real users in this
respect.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent a8a4d15c

tests/test-blockjob-txn.c

+5 −1
Original line number Diff line number Diff line
@@ -96,7 +96,10 @@ static BlockJob *test_block_job_start(unsigned int iterations, 
    char job_id[24];



    data = g_new0(TestBlockJobCBData, 1);

    bs = bdrv_new();



    bs = bdrv_open("null-co://", NULL, NULL, 0, &error_abort);

    g_assert_nonnull(bs);



    snprintf(job_id, sizeof(job_id), "job%u", counter++);

    s = block_job_create(job_id, &test_block_job_driver, bs, 0,

                         BLOCK_JOB_DEFAULT, test_block_job_cb,
@@ -242,6 +245,7 @@ static void test_pair_jobs_fail_cancel_race(void) 
int main(int argc, char **argv)

{

    qemu_init_main_loop(&error_abort);

    bdrv_init();



    g_test_init(&argc, &argv, NULL);

    g_test_add_func("/single/success", test_single_job_success);

tests/test-blockjob.c

+5 −1
Original line number Diff line number Diff line
@@ -54,7 +54,10 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id, 
static BlockBackend *create_blk(const char *name)

{

    BlockBackend *blk = blk_new();

    BlockDriverState *bs = bdrv_new();

    BlockDriverState *bs;



    bs = bdrv_open("null-co://", NULL, NULL, 0, &error_abort);

    g_assert_nonnull(bs);



    blk_insert_bs(blk, bs);

    bdrv_unref(bs);
@@ -140,6 +143,7 @@ static void test_job_ids(void) 
int main(int argc, char **argv)

{

    qemu_init_main_loop(&error_abort);

    bdrv_init();



    g_test_init(&argc, &argv, NULL);

    g_test_add_func("/blockjob/ids", test_job_ids);