These 2 tests exhibit two qmp bugs fixed by the previous patches. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Daniel P. Berrange <berra...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> --- tests/test-qemu-qmp.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 2 ++ tests/.gitignore | 1 + 3 files changed, 72 insertions(+) create mode 100644 tests/test-qemu-qmp.c
diff --git a/tests/test-qemu-qmp.c b/tests/test-qemu-qmp.c new file mode 100644 index 0000000..9d05829 --- /dev/null +++ b/tests/test-qemu-qmp.c @@ -0,0 +1,69 @@ +/* + * QTest testcase for qemu qmp commands + * + * Copyright (c) 2016 Red Hat, Inc. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +static void test_object_add_without_props(void) +{ + QDict *ret, *error; + const gchar *klass, *desc; + + ret = qmp("{'execute': 'object-add'," + " 'arguments': { 'qom-type': 'memory-backend-ram', 'id': 'ram1' } }"); + g_assert_nonnull(ret); + + error = qdict_get_qdict(ret, "error"); + klass = qdict_get_try_str(error, "class"); + desc = qdict_get_try_str(error, "desc"); + + g_assert_cmpstr(klass, ==, "GenericError"); + g_assert_cmpstr(desc, ==, "can't create backend with size 0"); + + QDECREF(ret); +} + +static void test_qom_set_without_value(void) +{ + QDict *ret, *error; + const gchar *klass, *desc; + + ret = qmp("{'execute': 'qom-set'," + " 'arguments': { 'path': '/machine', 'property': 'rtc-time' } }"); + g_assert_nonnull(ret); + + error = qdict_get_qdict(ret, "error"); + klass = qdict_get_try_str(error, "class"); + desc = qdict_get_try_str(error, "desc"); + + g_assert_cmpstr(klass, ==, "GenericError"); + g_assert_cmpstr(desc, ==, "Parameter 'value' is missing"); + + QDECREF(ret); +} + +int main(int argc, char **argv) +{ + int ret; + + g_test_init(&argc, &argv, NULL); + + qtest_start(""); + + qtest_add_func("/qemu-qmp/object-add-without-props", + test_object_add_without_props); + qtest_add_func("/qemu-qmp/qom-set-without-value", + test_qom_set_without_value); + + ret = g_test_run(); + + qtest_end(); + + return ret; +} diff --git a/tests/Makefile.include b/tests/Makefile.include index 6052a38..93f2ba1 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -296,6 +296,7 @@ check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) check-qtest-s390x-y = tests/boot-serial-test$(EXESUF) check-qtest-generic-y += tests/qom-test$(EXESUF) +check-qtest-generic-y += tests/test-qemu-qmp$(EXESUF) qapi-schema += alternate-any.json qapi-schema += alternate-array.json @@ -634,6 +635,7 @@ tests/tpci200-test$(EXESUF): tests/tpci200-test.o tests/display-vga-test$(EXESUF): tests/display-vga-test.o tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o tests/qom-test$(EXESUF): tests/qom-test.o +tests/test-qemu-qmp$(EXESUF): tests/test-qemu-qmp.o tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/nvme-test$(EXESUF): tests/nvme-test.o diff --git a/tests/.gitignore b/tests/.gitignore index b4a9cfc..abf3926 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -54,6 +54,7 @@ test-qdist test-qga test-qht test-qht-par +test-qemu-qmp test-qmp-commands test-qmp-commands.h test-qmp-event -- 2.10.0