motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 05:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/qtest: get rid of some 'qtest_qmp' usage in migration test

Browse source 
Some of the usage is just a verbose way of re-inventing the
qtest_qmp_assert_success(_ref) methods.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230601161347.1803440-5-berrange@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2023-06-01 17:13:41 +01:00 • committed by Juan Quintela
parent ffd4727589
commit 11936f0ef6
2 changed files with 21 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/qtest/migration-helpers.c
View file

@ -93,7 +93,7 @@ QDict *wait_command(QTestState *who, const char *command, ...)
void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...) void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...)
{ {
va_list ap; va_list ap;
QDict *args, *rsp; QDict *args;
va_start(ap, fmt); va_start(ap, fmt);
args = qdict_from_vjsonf_nofail(fmt, ap); args = qdict_from_vjsonf_nofail(fmt, ap);
@ -102,10 +102,8 @@ void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...)
g_assert(!qdict_haskey(args, "uri")); g_assert(!qdict_haskey(args, "uri"));
qdict_put_str(args, "uri", uri); qdict_put_str(args, "uri", uri);
rsp = qtest_qmp(who, "{ 'execute': 'migrate', 'arguments': %p}", args); qtest_qmp_assert_success(who,
"{ 'execute': 'migrate', 'arguments': %p}", args);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
} }
/* /*

52
tests/qtest/migration-test.c
View file

@ -359,14 +359,10 @@ static void migrate_check_parameter_int(QTestState *who, const char *parameter,
static void migrate_set_parameter_int(QTestState *who, const char *parameter, static void migrate_set_parameter_int(QTestState *who, const char *parameter,
long long value) long long value)
{ {
QDict *rsp; qtest_qmp_assert_success(who,
"{ 'execute': 'migrate-set-parameters',"
rsp = qtest_qmp(who, "'arguments': { %s: %lld } }",
"{ 'execute': 'migrate-set-parameters'," parameter, value);
"'arguments': { %s: %lld } }",
parameter, value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
migrate_check_parameter_int(who, parameter, value); migrate_check_parameter_int(who, parameter, value);
} }
@ -392,14 +388,10 @@ static void migrate_check_parameter_str(QTestState *who, const char *parameter,
static void migrate_set_parameter_str(QTestState *who, const char *parameter, static void migrate_set_parameter_str(QTestState *who, const char *parameter,
const char *value) const char *value)
{ {
QDict *rsp; qtest_qmp_assert_success(who,
"{ 'execute': 'migrate-set-parameters',"
rsp = qtest_qmp(who, "'arguments': { %s: %s } }",
"{ 'execute': 'migrate-set-parameters'," parameter, value);
"'arguments': { %s: %s } }",
parameter, value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
migrate_check_parameter_str(who, parameter, value); migrate_check_parameter_str(who, parameter, value);
} }
@ -427,14 +419,10 @@ static void migrate_check_parameter_bool(QTestState *who, const char *parameter,
static void migrate_set_parameter_bool(QTestState *who, const char *parameter, static void migrate_set_parameter_bool(QTestState *who, const char *parameter,
int value) int value)
{ {
QDict *rsp; qtest_qmp_assert_success(who,
"{ 'execute': 'migrate-set-parameters',"
rsp = qtest_qmp(who, "'arguments': { %s: %i } }",
"{ 'execute': 'migrate-set-parameters'," parameter, value);
"'arguments': { %s: %i } }",
parameter, value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
migrate_check_parameter_bool(who, parameter, value); migrate_check_parameter_bool(who, parameter, value);
} }
@ -494,16 +482,12 @@ static void migrate_cancel(QTestState *who)
static void migrate_set_capability(QTestState *who, const char *capability, static void migrate_set_capability(QTestState *who, const char *capability,
bool value) bool value)
{ {
QDict *rsp; qtest_qmp_assert_success(who,
"{ 'execute': 'migrate-set-capabilities',"
rsp = qtest_qmp(who, "'arguments': { "
"{ 'execute': 'migrate-set-capabilities'," "'capabilities': [ { "
"'arguments': { " "'capability': %s, 'state': %i } ] } }",
"'capabilities': [ { " capability, value);
"'capability': %s, 'state': %i } ] } }",
capability, value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
} }
static void migrate_postcopy_start(QTestState *from, QTestState *to) static void migrate_postcopy_start(QTestState *from, QTestState *to)