mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/qmp-cmd-test: Use qtest_init() instead of qtest_start()

Browse Source 
qtest_start() + qtest_end() should be avoided, since they use the
global_qtest variable that we want to get rid of in the long run
(since global_qtest can not be used in tests that have to track
multiple QEMU states, like migration tests). Use qtest_init() and
qtest_quit() instead.

Message-Id: <20190409085245.31548-4-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-04-09 10:52:43 +02:00
parent 2756f82af4
commit da9cd2d06c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/qmp-cmd-test.c
View File

@ -61,10 +61,11 @@ static void test_query(const void *data)
int expected_error_class = query_error_class(cmd); int expected_error_class = query_error_class(cmd);
QDict *resp, *error; QDict *resp, *error;
const char *error_class; const char *error_class;
QTestState *qts;
qtest_start(common_args); qts = qtest_init(common_args);
resp = qmp("{ 'execute': %s }", cmd); resp = qtest_qmp(qts, "{ 'execute': %s }", cmd);
error = qdict_get_qdict(resp, "error"); error = qdict_get_qdict(resp, "error");
error_class = error ? qdict_get_str(error, "class") : NULL; error_class = error ? qdict_get_str(error, "class") : NULL;
@ -78,7 +79,7 @@ static void test_query(const void *data)
} }
qobject_unref(resp); qobject_unref(resp);
qtest_end(); qtest_quit(qts);
} }
static bool query_is_blacklisted(const char *cmd) static bool query_is_blacklisted(const char *cmd)
@ -118,16 +119,18 @@ static void qmp_schema_init(QmpSchema *schema)
QDict *resp; QDict *resp;
Visitor *qiv; Visitor *qiv;
SchemaInfoList *tail; SchemaInfoList *tail;
QTestState *qts;
qtest_start(common_args); qts = qtest_init(common_args);
resp = qmp("{ 'execute': 'query-qmp-schema' }");
resp = qtest_qmp(qts, "{ 'execute': 'query-qmp-schema' }");
qiv = qobject_input_visitor_new(qdict_get(resp, "return")); qiv = qobject_input_visitor_new(qdict_get(resp, "return"));
visit_type_SchemaInfoList(qiv, NULL, &schema->list, &error_abort); visit_type_SchemaInfoList(qiv, NULL, &schema->list, &error_abort);
visit_free(qiv); visit_free(qiv);
qobject_unref(resp); qobject_unref(resp);
qtest_end(); qtest_quit(qts);
schema->hash = g_hash_table_new(g_str_hash, g_str_equal); schema->hash = g_hash_table_new(g_str_hash, g_str_equal);