Commit a2726593 authored by Thomas Huth's avatar Thomas Huth
Browse files

tests/migration: Do not use functions anymore that rely on global_qtest 



The migration tests deal with multiple test states, so we really should
not use functions here that rely on the single global_qtest variable.
Switch from qtest_start() to qtest_init() to make sure that global_qtest
is not set anymore. This also revealed a regression in the migrate()
function: It has once been converted to use the qtest_qmp() function,
but commit b5bbd3f3 ("Clean up string interpolation into QMP,
part 2") accidentally reverted it back to qmp().

Message-Id: <20190904130047.25808-2-thuth@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 500efcfc

tests/migration-test.c

+3 −3
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static void migrate(QTestState *who, const char *uri, const char *fmt, ...) 
    g_assert(!qdict_haskey(args, "uri"));

    qdict_put_str(args, "uri", uri);



    rsp = qmp("{ 'execute': 'migrate', 'arguments': %p}", args);

    rsp = qtest_qmp(who, "{ 'execute': 'migrate', 'arguments': %p}", args);



    g_assert(qdict_haskey(rsp, "return"));

    qobject_unref(rsp);
@@ -625,7 +625,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, 
        cmd_dst = tmp;

    }



    *from = qtest_start(cmd_src);

    *from = qtest_init(cmd_src);

    g_free(cmd_src);



    *to = qtest_init(cmd_dst);
@@ -715,7 +715,7 @@ static void test_deprecated(void) 
{

    QTestState *from;



    from = qtest_start("-machine none");

    from = qtest_init("-machine none");



    deprecated_set_downtime(from, 0.12345);

    deprecated_set_speed(from, 12345);