david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: add a qmp success-response test

Browse Source 
Verify the usage of this schema feature and the API behaviour.  This
should be the only case where qmp_dispatch() returns NULL.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-08-30 17:58:10 +02:00 committed by Thomas Huth
parent 2b70ea9276
commit ae6bf76604
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qapi-schema/qapi-schema-test.json
View File

@ -137,6 +137,8 @@
'data': {'ud1a': 'UserDefOne', '*ud1b': 'UserDefOne'}, 'data': {'ud1a': 'UserDefOne', '*ud1b': 'UserDefOne'},
'returns': 'UserDefTwo' } 'returns': 'UserDefTwo' }
{ 'command': 'cmd-success-response', 'data': {}, 'success-response': false }
# Returning a non-dictionary requires a name from the whitelist # Returning a non-dictionary requires a name from the whitelist
{ 'command': 'guest-get-time', 'data': {'a': 'int', '*b': 'int' }, { 'command': 'guest-get-time', 'data': {'a': 'int', '*b': 'int' },
'returns': 'int' } 'returns': 'int' }

2
tests/qapi-schema/qapi-schema-test.out
View File

@ -156,6 +156,8 @@ object q_obj_user_def_cmd2-arg
member ud1b: UserDefOne optional=True member ud1b: UserDefOne optional=True
command user_def_cmd2 q_obj_user_def_cmd2-arg -> UserDefTwo command user_def_cmd2 q_obj_user_def_cmd2-arg -> UserDefTwo
gen=True success_response=True boxed=False oob=False preconfig=False gen=True success_response=True boxed=False oob=False preconfig=False
command cmd-success-response None -> None
gen=True success_response=False boxed=False oob=False preconfig=False
object q_obj_guest-get-time-arg object q_obj_guest-get-time-arg
member a: int optional=False member a: int optional=False
member b: int optional=True member b: int optional=True

17
tests/test-qmp-cmds.c
View File

@ -32,6 +32,10 @@ void qmp_test_flags_command(Error **errp)
{ {
} }
void qmp_cmd_success_response(Error **errp)
{
}
Empty2 *qmp_user_def_cmd0(Error **errp) Empty2 *qmp_user_def_cmd0(Error **errp)
{ {
return g_new0(Empty2, 1); return g_new0(Empty2, 1);
@ -153,6 +157,17 @@ static void test_dispatch_cmd_failure(void)
qobject_unref(req); qobject_unref(req);
} }
static void test_dispatch_cmd_success_response(void)
{
QDict *req = qdict_new();
QDict *resp;
qdict_put_str(req, "execute", "cmd-success-response");
resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false);
g_assert_null(resp);
qobject_unref(req);
}
static QObject *test_qmp_dispatch(QDict *req) static QObject *test_qmp_dispatch(QDict *req)
{ {
QDict *resp; QDict *resp;
@ -289,6 +304,8 @@ int main(int argc, char **argv)
g_test_add_func("/qmp/dispatch_cmd", test_dispatch_cmd); g_test_add_func("/qmp/dispatch_cmd", test_dispatch_cmd);
g_test_add_func("/qmp/dispatch_cmd_failure", test_dispatch_cmd_failure); g_test_add_func("/qmp/dispatch_cmd_failure", test_dispatch_cmd_failure);
g_test_add_func("/qmp/dispatch_cmd_io", test_dispatch_cmd_io); g_test_add_func("/qmp/dispatch_cmd_io", test_dispatch_cmd_io);
g_test_add_func("/qmp/dispatch_cmd_success_response",
test_dispatch_cmd_success_response);
g_test_add_func("/qmp/dealloc_types", test_dealloc_types); g_test_add_func("/qmp/dealloc_types", test_dealloc_types);
g_test_add_func("/qmp/dealloc_partial", test_dealloc_partial); g_test_add_func("/qmp/dealloc_partial", test_dealloc_partial);