| Message ID | 20190904130047.25808-2-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Make the core libqtest library independe from global_qtest | expand |
On Wed, Sep 04, 2019 at 03:00:42PM +0200, Thomas Huth wrote: > 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 b5bbd3f315d686bd511 ("Clean up string interpolation into QMP, > part 2") accidentally reverted it back to qmp(). > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Laurent Vivier <lvivier@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/migration-test.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/tests/migration-test.c b/tests/migration-test.c index b87ba99a9e..a9f81cc185 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -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);
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 b5bbd3f315d686bd511 ("Clean up string interpolation into QMP, part 2") accidentally reverted it back to qmp(). Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)