ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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.
Use qtest_init() and qtest_quit() instead.

Message-Id: <20190515174328.16361-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-05-15 19:43:26 +02:00
parent 3d5e7087bd
commit 9266ebc97b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/qom-test.c
View File

@ -44,7 +44,7 @@ static bool is_blacklisted(const char *arch, const char *mach)
return false; return false;
} }
static void test_properties(const char *path, bool recurse) static void test_properties(QTestState *qts, const char *path, bool recurse)
{ {
char *child_path; char *child_path;
QDict *response, *tuple, *tmp; QDict *response, *tuple, *tmp;
@ -52,8 +52,8 @@ static void test_properties(const char *path, bool recurse)
QListEntry *entry; QListEntry *entry;
g_test_message("Obtaining properties of %s", path); g_test_message("Obtaining properties of %s", path);
response = qmp("{ 'execute': 'qom-list'," response = qtest_qmp(qts, "{ 'execute': 'qom-list',"
" 'arguments': { 'path': %s } }", path); " 'arguments': { 'path': %s } }", path);
g_assert(response); g_assert(response);
if (!recurse) { if (!recurse) {
@ -71,15 +71,15 @@ static void test_properties(const char *path, bool recurse)
if (is_child || is_link) { if (is_child || is_link) {
child_path = g_strdup_printf("%s/%s", child_path = g_strdup_printf("%s/%s",
path, qdict_get_str(tuple, "name")); path, qdict_get_str(tuple, "name"));
test_properties(child_path, is_child); test_properties(qts, child_path, is_child);
g_free(child_path); g_free(child_path);
} else { } else {
const char *prop = qdict_get_str(tuple, "name"); const char *prop = qdict_get_str(tuple, "name");
g_test_message("Testing property %s.%s", path, prop); g_test_message("Testing property %s.%s", path, prop);
tmp = qmp("{ 'execute': 'qom-get'," tmp = qtest_qmp(qts,
" 'arguments': { 'path': %s," "{ 'execute': 'qom-get',"
" 'property': %s } }", " 'arguments': { 'path': %s, 'property': %s } }",
path, prop); path, prop);
/* qom-get may fail but should not, e.g., segfault. */ /* qom-get may fail but should not, e.g., segfault. */
g_assert(tmp); g_assert(tmp);
qobject_unref(tmp); qobject_unref(tmp);
@ -91,20 +91,18 @@ static void test_properties(const char *path, bool recurse)
static void test_machine(gconstpointer data) static void test_machine(gconstpointer data)
{ {
const char *machine = data; const char *machine = data;
char *args;
QDict *response; QDict *response;
QTestState *qts;
args = g_strdup_printf("-machine %s", machine); qts = qtest_initf("-machine %s", machine);
qtest_start(args);
test_properties("/machine", true); test_properties(qts, "/machine", true);
response = qmp("{ 'execute': 'quit' }"); response = qtest_qmp(qts, "{ 'execute': 'quit' }");
g_assert(qdict_haskey(response, "return")); g_assert(qdict_haskey(response, "return"));
qobject_unref(response); qobject_unref(response);
qtest_end(); qtest_quit(qts);
g_free(args);
g_free((void *)machine); g_free((void *)machine);
} }