From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: paolo.bonzini@gmail.com, berrange@redhat.com,
qemu-stable@nongnu.org, eblake@redhat.com, armbru@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v3 3/3] tests: start generic qemu-qmp tests
Date: Thu, 22 Sep 2016 22:48:49 +0400 [thread overview]
Message-ID: <20160922184849.30524-4-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20160922184849.30524-1-marcandre.lureau@redhat.com>
These 2 tests exhibit two qmp bugs fixed by the previous patches.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---
tests/test-qemu-qmp.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile.include | 2 ++
2 files changed, 63 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..3cdee59
--- /dev/null
+++ b/tests/test-qemu-qmp.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..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
--
2.10.0
next prev parent reply other threads:[~2016-09-22 18:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 18:48 [Qemu-devel] [PATCH v3 0/3] Fix some qapi assert() Marc-André Lureau
2016-09-22 18:48 ` [Qemu-devel] [PATCH v3 1/3] qmp: fix object-add assert() without props Marc-André Lureau
2016-09-22 18:48 ` [Qemu-devel] [PATCH v3 2/3] qapi: fix crash when a parameter is missing Marc-André Lureau
2016-09-22 18:48 ` Marc-André Lureau [this message]
2016-09-22 19:13 ` [Qemu-devel] [PATCH v3 3/3] tests: start generic qemu-qmp tests Eric Blake
2016-09-22 19:23 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160922184849.30524-4-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=paolo.bonzini@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).