[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/13] tests/qom-test: Use qtest_init() instead of qt
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 06/13] tests/qom-test: Use qtest_init() instead of qtest_start() |
Date: |
Tue, 21 May 2019 12:53:37 +0200 |
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: <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
tests/qom-test.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/tests/qom-test.c b/tests/qom-test.c
index 73c52af3bb..4f94cc678c 100644
--- a/tests/qom-test.c
+++ b/tests/qom-test.c
@@ -44,7 +44,7 @@ static bool is_blacklisted(const char *arch, const char *mach)
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;
QDict *response, *tuple, *tmp;
@@ -52,8 +52,8 @@ static void test_properties(const char *path, bool recurse)
QListEntry *entry;
g_test_message("Obtaining properties of %s", path);
- response = qmp("{ 'execute': 'qom-list',"
- " 'arguments': { 'path': %s } }", path);
+ response = qtest_qmp(qts, "{ 'execute': 'qom-list',"
+ " 'arguments': { 'path': %s } }", path);
g_assert(response);
if (!recurse) {
@@ -71,15 +71,15 @@ static void test_properties(const char *path, bool recurse)
if (is_child || is_link) {
child_path = g_strdup_printf("%s/%s",
path, qdict_get_str(tuple, "name"));
- test_properties(child_path, is_child);
+ test_properties(qts, child_path, is_child);
g_free(child_path);
} else {
const char *prop = qdict_get_str(tuple, "name");
g_test_message("Testing property %s.%s", path, prop);
- tmp = qmp("{ 'execute': 'qom-get',"
- " 'arguments': { 'path': %s,"
- " 'property': %s } }",
- path, prop);
+ tmp = qtest_qmp(qts,
+ "{ 'execute': 'qom-get',"
+ " 'arguments': { 'path': %s, 'property': %s } }",
+ path, prop);
/* qom-get may fail but should not, e.g., segfault. */
g_assert(tmp);
qobject_unref(tmp);
@@ -91,20 +91,18 @@ static void test_properties(const char *path, bool recurse)
static void test_machine(gconstpointer data)
{
const char *machine = data;
- char *args;
QDict *response;
+ QTestState *qts;
- args = g_strdup_printf("-machine %s", machine);
- qtest_start(args);
+ qts = qtest_initf("-machine %s", machine);
- 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"));
qobject_unref(response);
- qtest_end();
- g_free(args);
+ qtest_quit(qts);
g_free((void *)machine);
}
--
2.21.0
- [Qemu-devel] [PULL 00/13] qtests and some iotest patches, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 01/13] tests/libqtest: Remove unused global_qtest-related wrapper functions, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 02/13] tests/libqtest: Fix description of qtest_vinitf() and qtest_initf(), Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 03/13] tests/libqos: Get rid of global_qtest dependency in qvring_init(), Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 04/13] tests/q35-test: Make test independent of global_qtest, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 06/13] tests/qom-test: Use qtest_init() instead of qtest_start(),
Thomas Huth <=
- [Qemu-devel] [PULL 05/13] tests/numa-test: Use qtest_init() instead of qtest_start(), Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 07/13] tests/device-introspect: Use qtest_init() instead of qtest_start(), Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 10/13] tests/qemu-iotests/check: Pick a default machine if necessary, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 09/13] tests/qemu-iotests/005: Add a sanity check for large sparse file support, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 08/13] tests/hd-geo-test: Use qtest_init() instead of qtest_start(), Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 12/13] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 11/13] tests/qemu-iotests: Do not hard-code the path to bash, Thomas Huth, 2019/05/21
- [Qemu-devel] [PULL 13/13] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests, Thomas Huth, 2019/05/21