tests/qtest: misc tweaks to readconfig
The property name parameter is ignored when visiting a top level type, but the obvious typo should be fixed to avoid confusion. A few indentation issues were tidied up. We can break out of the loop when finding the RNG device. Finally, close the temp FD immediately when no longer needed. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20220809093854.168438-1-berrange@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
d102b8162a
commit
9c23d71934
|
@ -33,13 +33,12 @@ static QTestState *qtest_init_with_config(const char *cfgdata)
|
||||||
g_assert_cmpint(cfgfd, >=, 0);
|
g_assert_cmpint(cfgfd, >=, 0);
|
||||||
|
|
||||||
ret = qemu_write_full(cfgfd, cfgdata, strlen(cfgdata));
|
ret = qemu_write_full(cfgfd, cfgdata, strlen(cfgdata));
|
||||||
|
close(cfgfd);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
unlink(cfgpath);
|
unlink(cfgpath);
|
||||||
}
|
}
|
||||||
g_assert_cmpint(ret, ==, strlen(cfgdata));
|
g_assert_cmpint(ret, ==, strlen(cfgdata));
|
||||||
|
|
||||||
close(cfgfd);
|
|
||||||
|
|
||||||
args = g_strdup_printf("-nodefaults -machine none -readconfig %s", cfgpath);
|
args = g_strdup_printf("-nodefaults -machine none -readconfig %s", cfgpath);
|
||||||
|
|
||||||
qts = qtest_init(args);
|
qts = qtest_init(args);
|
||||||
|
@ -79,7 +78,7 @@ static void test_x86_memdev(void)
|
||||||
"size = \"200\"";
|
"size = \"200\"";
|
||||||
|
|
||||||
qts = qtest_init_with_config(cfgdata);
|
qts = qtest_init_with_config(cfgdata);
|
||||||
/* Test valid command */
|
/* Test valid command */
|
||||||
resp = qtest_qmp(qts, "{ 'execute': 'query-memdev' }");
|
resp = qtest_qmp(qts, "{ 'execute': 'query-memdev' }");
|
||||||
test_x86_memdev_resp(qdict_get(resp, "return"));
|
test_x86_memdev_resp(qdict_get(resp, "return"));
|
||||||
qobject_unref(resp);
|
qobject_unref(resp);
|
||||||
|
@ -96,7 +95,7 @@ static void test_spice_resp(QObject *res)
|
||||||
|
|
||||||
g_assert(res);
|
g_assert(res);
|
||||||
v = qobject_input_visitor_new(res);
|
v = qobject_input_visitor_new(res);
|
||||||
visit_type_SpiceInfo(v, "spcie", &spice, &error_abort);
|
visit_type_SpiceInfo(v, "spice", &spice, &error_abort);
|
||||||
|
|
||||||
g_assert(spice);
|
g_assert(spice);
|
||||||
g_assert(spice->enabled);
|
g_assert(spice->enabled);
|
||||||
|
@ -114,7 +113,7 @@ static void test_spice(void)
|
||||||
"unix = \"on\"\n";
|
"unix = \"on\"\n";
|
||||||
|
|
||||||
qts = qtest_init_with_config(cfgdata);
|
qts = qtest_init_with_config(cfgdata);
|
||||||
/* Test valid command */
|
/* Test valid command */
|
||||||
resp = qtest_qmp(qts, "{ 'execute': 'query-spice' }");
|
resp = qtest_qmp(qts, "{ 'execute': 'query-spice' }");
|
||||||
test_spice_resp(qdict_get(resp, "return"));
|
test_spice_resp(qdict_get(resp, "return"));
|
||||||
qobject_unref(resp);
|
qobject_unref(resp);
|
||||||
|
@ -144,6 +143,7 @@ static void test_object_rng_resp(QObject *res)
|
||||||
if (g_str_equal(obj->name, "rng0") &&
|
if (g_str_equal(obj->name, "rng0") &&
|
||||||
g_str_equal(obj->type, "child<rng-builtin>")) {
|
g_str_equal(obj->type, "child<rng-builtin>")) {
|
||||||
seen_rng = true;
|
seen_rng = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
tmp = tmp->next;
|
tmp = tmp->next;
|
||||||
|
@ -164,7 +164,7 @@ static void test_object_rng(void)
|
||||||
"id = \"rng0\"\n";
|
"id = \"rng0\"\n";
|
||||||
|
|
||||||
qts = qtest_init_with_config(cfgdata);
|
qts = qtest_init_with_config(cfgdata);
|
||||||
/* Test valid command */
|
/* Test valid command */
|
||||||
resp = qtest_qmp(qts,
|
resp = qtest_qmp(qts,
|
||||||
"{ 'execute': 'qom-list',"
|
"{ 'execute': 'qom-list',"
|
||||||
" 'arguments': {'path': '/objects' }}");
|
" 'arguments': {'path': '/objects' }}");
|
||||||
|
|
Loading…
Reference in New Issue