| Message ID | 20160922130905.4720-4-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Sep 22, 2016 at 05:09:05PM +0400, Marc-André Lureau wrote: > These 2 tests exhibit two qmp bugs fixed by the previous patches. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > tests/qemu-qmp-test.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ Nitpick - we're not 100% perfect, but the most common convention in tests/ is to use 'test-' as the name prefix for files that contain test suites eg test-qemu-qmp.c > tests/Makefile.include | 1 + > 2 files changed, 62 insertions(+) > create mode 100644 tests/qemu-qmp-test.c > > diff --git a/tests/qemu-qmp-test.c b/tests/qemu-qmp-test.c > new file mode 100644 > index 0000000..3cdee59 > --- /dev/null > +++ b/tests/qemu-qmp-test.c > @@ -0,0 +1,61 @@ > +#include "qemu/osdep.h" > +#include "libqtest.h" > + > + > +static void test_object_add_without_props(void) > +{ > + QDict *ret, *error; > + const gchar *class, *desc; > + > + ret = qmp("{'execute': 'object-add'," > + " 'arguments': { 'qom-type': 'memory-backend-ram', 'id': 'ram1' } }"); > + g_assert_nonnull(ret); > + > + error = qdict_get_qdict(ret, "error"); > + class = qdict_get_try_str(error, "class"); > + desc = qdict_get_try_str(error, "desc"); > + > + g_assert_cmpstr(class, ==, "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 *class, *desc; > + > + ret = qmp("{'execute': 'qom-set'," > + " 'arguments': { 'path': '/machine', 'property': 'rtc-time' } }"); > + g_assert_nonnull(ret); > + > + error = qdict_get_qdict(ret, "error"); > + class = qdict_get_try_str(error, "class"); > + desc = qdict_get_try_str(error, "desc"); > + > + g_assert_cmpstr(class, ==, "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..ce7edf8 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/qemu-qmp-test$(EXESUF) > > qapi-schema += alternate-any.json > qapi-schema += alternate-array.json Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel
diff --git a/tests/qemu-qmp-test.c b/tests/qemu-qmp-test.c new file mode 100644 index 0000000..3cdee59 --- /dev/null +++ b/tests/qemu-qmp-test.c @@ -0,0 +1,61 @@ +#include "qemu/osdep.h" +#include "libqtest.h" + + +static void test_object_add_without_props(void) +{ + QDict *ret, *error; + const gchar *class, *desc; + + ret = qmp("{'execute': 'object-add'," + " 'arguments': { 'qom-type': 'memory-backend-ram', 'id': 'ram1' } }"); + g_assert_nonnull(ret); + + error = qdict_get_qdict(ret, "error"); + class = qdict_get_try_str(error, "class"); + desc = qdict_get_try_str(error, "desc"); + + g_assert_cmpstr(class, ==, "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 *class, *desc; + + ret = qmp("{'execute': 'qom-set'," + " 'arguments': { 'path': '/machine', 'property': 'rtc-time' } }"); + g_assert_nonnull(ret); + + error = qdict_get_qdict(ret, "error"); + class = qdict_get_try_str(error, "class"); + desc = qdict_get_try_str(error, "desc"); + + g_assert_cmpstr(class, ==, "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..ce7edf8 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/qemu-qmp-test$(EXESUF) qapi-schema += alternate-any.json qapi-schema += alternate-array.json
These 2 tests exhibit two qmp bugs fixed by the previous patches. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- tests/qemu-qmp-test.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 1 + 2 files changed, 62 insertions(+) create mode 100644 tests/qemu-qmp-test.c