[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/23] migration-test: Make wait_command() return
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 14/23] migration-test: Make wait_command() return the "return" member |
Date: |
Fri, 27 Jul 2018 17:13:50 +0200 |
All callers of wait_command() are only interested in the success
response's "return" member. Lift its extraction into wait_command().
Cc: Juan Quintela <address@hidden>
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
tests/migration-test.c | 38 +++++++++++++++-----------------------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index c6c7089ce1..e336399a71 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -152,7 +152,7 @@ static void wait_for_serial(const char *side)
static QDict *wait_command(QTestState *who, const char *command)
{
const char *event_string;
- QDict *response;
+ QDict *response, *ret;
response = qtest_qmp(who, command);
@@ -165,7 +165,12 @@ static QDict *wait_command(QTestState *who, const char
*command)
qobject_unref(response);
response = qtest_qmp_receive(who);
}
- return response;
+
+ ret = qdict_get_qdict(response, "return");
+ g_assert(ret);
+ qobject_ref(ret);
+ qobject_unref(response);
+ return ret;
}
/*
@@ -174,15 +179,7 @@ static QDict *wait_command(QTestState *who, const char
*command)
*/
static QDict *migrate_query(QTestState *who)
{
- QDict *rsp, *rsp_return;
-
- rsp = wait_command(who, "{ 'execute': 'query-migrate' }");
- rsp_return = qdict_get_qdict(rsp, "return");
- g_assert(rsp_return);
- qobject_ref(rsp_return);
- qobject_unref(rsp);
-
- return rsp_return;
+ return wait_command(who, "{ 'execute': 'query-migrate' }");
}
/*
@@ -324,16 +321,16 @@ static void cleanup(const char *filename)
static void migrate_check_parameter(QTestState *who, const char *parameter,
const char *value)
{
- QDict *rsp, *rsp_return;
+ QDict *rsp_return;
char *result;
- rsp = wait_command(who, "{ 'execute': 'query-migrate-parameters' }");
- rsp_return = qdict_get_qdict(rsp, "return");
+ rsp_return = wait_command(who,
+ "{ 'execute': 'query-migrate-parameters' }");
result = g_strdup_printf("%" PRId64,
qdict_get_try_int(rsp_return, parameter, -1));
g_assert_cmpstr(result, ==, value);
g_free(result);
- qobject_unref(rsp);
+ qobject_unref(rsp_return);
}
static void migrate_set_parameter(QTestState *who, const char *parameter,
@@ -357,7 +354,6 @@ static void migrate_pause(QTestState *who)
QDict *rsp;
rsp = wait_command(who, "{ 'execute': 'migrate-pause' }");
- g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
}
@@ -370,7 +366,6 @@ static void migrate_recover(QTestState *who, const char
*uri)
" 'arguments': { 'uri': '%s' } }", uri);
rsp = wait_command(who, cmd);
- g_assert(qdict_haskey(rsp, "return"));
g_free(cmd);
qobject_unref(rsp);
}
@@ -411,7 +406,6 @@ static void migrate_postcopy_start(QTestState *from,
QTestState *to)
QDict *rsp;
rsp = wait_command(from, "{ 'execute': 'migrate-start-postcopy' }");
- g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
if (!got_stop) {
@@ -689,7 +683,7 @@ static void test_postcopy_recovery(void)
static void test_baddest(void)
{
QTestState *from, *to;
- QDict *rsp, *rsp_return;
+ QDict *rsp_return;
char *status;
bool failed;
@@ -705,12 +699,10 @@ static void test_baddest(void)
} while (!failed);
/* Is the machine currently running? */
- rsp = wait_command(from, "{ 'execute': 'query-status' }");
- g_assert(qdict_haskey(rsp, "return"));
- rsp_return = qdict_get_qdict(rsp, "return");
+ rsp_return = wait_command(from, "{ 'execute': 'query-status' }");
g_assert(qdict_haskey(rsp_return, "running"));
g_assert(qdict_get_bool(rsp_return, "running"));
- qobject_unref(rsp);
+ qobject_unref(rsp_return);
test_migrate_end(from, to, false);
}
--
2.17.1
- Re: [Qemu-devel] [PATCH v2 16/23] migration-test: Make wait_command() cope with '%', (continued)
- [Qemu-devel] [PATCH v2 23/23] libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 15/23] tests: New helper qtest_qmp_receive_success(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 05/23] qobject: Replace qobject_from_jsonf() by qobject_from_jsonf_nofail(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 14/23] migration-test: Make wait_command() return the "return" member,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 01/23] libqtest: Document calling conventions, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 10/23] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 13/23] tests: Clean up string interpolation around qtest_qmp_device_add(), Markus Armbruster, 2018/07/27