tests: add qtest_qmp_device_add_qdict() helper
Add an API that takes QDict directly, so users could skip steps of first building json dictionary and converting it back to QDict in existing qtest_qmp_device_add() and instead use QDict directly without intermediate conversion. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20190830110723.15096-2-imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
69b81893bc
commit
b4510bb410
|
@ -1243,28 +1243,37 @@ QDict *qtest_qmp_receive_success(QTestState *s,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generic hot-plugging test via the device_add QMP command.
|
* Generic hot-plugging test via the device_add QMP commands.
|
||||||
*/
|
*/
|
||||||
|
void qtest_qmp_device_add_qdict(QTestState *qts, const char *drv,
|
||||||
|
const QDict *arguments)
|
||||||
|
{
|
||||||
|
QDict *resp;
|
||||||
|
QDict *args = arguments ? qdict_clone_shallow(arguments) : qdict_new();
|
||||||
|
|
||||||
|
g_assert(!qdict_haskey(args, "driver"));
|
||||||
|
qdict_put_str(args, "driver", drv);
|
||||||
|
resp = qtest_qmp(qts, "{'execute': 'device_add', 'arguments': %p}", args);
|
||||||
|
g_assert(resp);
|
||||||
|
g_assert(!qdict_haskey(resp, "event")); /* We don't expect any events */
|
||||||
|
g_assert(!qdict_haskey(resp, "error"));
|
||||||
|
qobject_unref(resp);
|
||||||
|
}
|
||||||
|
|
||||||
void qtest_qmp_device_add(QTestState *qts, const char *driver, const char *id,
|
void qtest_qmp_device_add(QTestState *qts, const char *driver, const char *id,
|
||||||
const char *fmt, ...)
|
const char *fmt, ...)
|
||||||
{
|
{
|
||||||
QDict *args, *response;
|
QDict *args;
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
args = qdict_from_vjsonf_nofail(fmt, ap);
|
args = qdict_from_vjsonf_nofail(fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
||||||
g_assert(!qdict_haskey(args, "driver") && !qdict_haskey(args, "id"));
|
g_assert(!qdict_haskey(args, "id"));
|
||||||
qdict_put_str(args, "driver", driver);
|
|
||||||
qdict_put_str(args, "id", id);
|
qdict_put_str(args, "id", id);
|
||||||
|
|
||||||
response = qtest_qmp(qts, "{'execute': 'device_add', 'arguments': %p}",
|
qtest_qmp_device_add_qdict(qts, driver, args);
|
||||||
args);
|
|
||||||
g_assert(response);
|
|
||||||
g_assert(!qdict_haskey(response, "event")); /* We don't expect any events */
|
|
||||||
g_assert(!qdict_haskey(response, "error"));
|
|
||||||
qobject_unref(response);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void device_deleted_cb(void *opaque, const char *name, QDict *data)
|
static void device_deleted_cb(void *opaque, const char *name, QDict *data)
|
||||||
|
|
|
@ -659,6 +659,18 @@ QDict *qmp_fd(int fd, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
|
||||||
void qtest_cb_for_every_machine(void (*cb)(const char *machine),
|
void qtest_cb_for_every_machine(void (*cb)(const char *machine),
|
||||||
bool skip_old_versioned);
|
bool skip_old_versioned);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* qtest_qmp_device_add_qdict:
|
||||||
|
* @qts: QTestState instance to operate on
|
||||||
|
* @drv: Name of the device that should be added
|
||||||
|
* @arguments: QDict with properties for the device to intialize
|
||||||
|
*
|
||||||
|
* Generic hot-plugging test via the device_add QMP command with properties
|
||||||
|
* supplied in form of QDict. Use NULL for empty properties list.
|
||||||
|
*/
|
||||||
|
void qtest_qmp_device_add_qdict(QTestState *qts, const char *drv,
|
||||||
|
const QDict *arguments);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* qtest_qmp_device_add:
|
* qtest_qmp_device_add:
|
||||||
* @qts: QTestState instance to operate on
|
* @qts: QTestState instance to operate on
|
||||||
|
|
Loading…
Reference in a new issue