| Message ID | 20180719184111.5129-16-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | monitor: various code simplification and fixes | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > These 2 tests exhibited two qmp bugs that were fixed in 2.7 > (series from commit e64c75a9752c5d0fd64eb2e684c656a5ea7d03c6 to > commit 1382d4abdf9619985e4078e37e49e487cea9935e) > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > tests/qmp-test.c | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/tests/qmp-test.c b/tests/qmp-test.c > index b9774084f8..54611e587f 100644 > --- a/tests/qmp-test.c > +++ b/tests/qmp-test.c > @@ -249,7 +249,40 @@ static void test_qmp_oob(void) > recv_cmd_id(qts, "blocks-2"); > recv_cmd_id(qts, "err-2"); > cleanup_blocking_cmd(); > +} > + > +static void test_object_add_without_props(void) > +{ > + QTestState *qts; > + QDict *ret; > + > + qts = qtest_init(common_args); > > + ret = qtest_qmp(qts, > + "{'execute': 'object-add', 'arguments':" > + " {'qom-type': 'memory-backend-ram', 'id': 'ram1' } }"); > + g_assert_nonnull(ret); > + > + g_assert_cmpstr(get_error_class(ret), ==, "GenericError"); > + > + qobject_unref(ret); > + qtest_quit(qts); > +} > + > +static void test_qom_set_without_value(void) > +{ > + QTestState *qts; > + QDict *ret; > + > + qts = qtest_init(common_args); > + > + ret = qtest_qmp(qts, "{'execute': 'qom-set', 'arguments':" > + " { 'path': '/machine', 'property': 'rtc-time' } }"); > + g_assert_nonnull(ret); > + > + g_assert_cmpstr(get_error_class(ret), ==, "GenericError"); > + > + qobject_unref(ret); > qtest_quit(qts); > } > > @@ -479,8 +512,13 @@ int main(int argc, char *argv[]) > > g_test_init(&argc, &argv, NULL); > > + qtest_add_func("qmp/object-add-without-props", > + test_object_add_without_props); > + qtest_add_func("qmp/qom-set-without-value", > + test_qom_set_without_value); > qtest_add_func("qmp/protocol", test_qmp_protocol); > qtest_add_func("qmp/oob", test_qmp_oob); > + > qmp_schema_init(&schema); > add_query_tests(&schema); > qtest_add_func("qmp/preconfig", test_qmp_preconfig); I've since moved tests that aren't protocol-related into qmp-cmd-test. As discussed in review of v1, test_object_add_without_props() isn't protocol-related. It tests a bug in qmp_object_add() we fixed in commit e64c75a975. Sadly, we don't have systematic object-add tests. This lone test can go into qmp-cmd-test for want of a better home. test_qom_set_without_value() isn't about qom-set, it's about a bug in infrastructure used by the QMP core, fixed in commit c489780203. We covered the bug in infrastructure unit tests (commit bce3035a44). If we want to test it at the QMP level as well, the test could go into qmp-test. Do we want to? In my quick rebase, I added both tests to qmp-cmd-test.c out of laziness.
diff --git a/tests/qmp-test.c b/tests/qmp-test.c index b9774084f8..54611e587f 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -249,7 +249,40 @@ static void test_qmp_oob(void) recv_cmd_id(qts, "blocks-2"); recv_cmd_id(qts, "err-2"); cleanup_blocking_cmd(); +} + +static void test_object_add_without_props(void) +{ + QTestState *qts; + QDict *ret; + + qts = qtest_init(common_args); + ret = qtest_qmp(qts, + "{'execute': 'object-add', 'arguments':" + " {'qom-type': 'memory-backend-ram', 'id': 'ram1' } }"); + g_assert_nonnull(ret); + + g_assert_cmpstr(get_error_class(ret), ==, "GenericError"); + + qobject_unref(ret); + qtest_quit(qts); +} + +static void test_qom_set_without_value(void) +{ + QTestState *qts; + QDict *ret; + + qts = qtest_init(common_args); + + ret = qtest_qmp(qts, "{'execute': 'qom-set', 'arguments':" + " { 'path': '/machine', 'property': 'rtc-time' } }"); + g_assert_nonnull(ret); + + g_assert_cmpstr(get_error_class(ret), ==, "GenericError"); + + qobject_unref(ret); qtest_quit(qts); } @@ -479,8 +512,13 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); + qtest_add_func("qmp/object-add-without-props", + test_object_add_without_props); + qtest_add_func("qmp/qom-set-without-value", + test_qom_set_without_value); qtest_add_func("qmp/protocol", test_qmp_protocol); qtest_add_func("qmp/oob", test_qmp_oob); + qmp_schema_init(&schema); add_query_tests(&schema); qtest_add_func("qmp/preconfig", test_qmp_preconfig);
These 2 tests exhibited two qmp bugs that were fixed in 2.7 (series from commit e64c75a9752c5d0fd64eb2e684c656a5ea7d03c6 to commit 1382d4abdf9619985e4078e37e49e487cea9935e) Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- tests/qmp-test.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)