mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
tests: Drop 'props' from object-add calls
The 'props' option has been deprecated in 5.0 in favour of a flattened object-add command. Time to change our test cases to drop the deprecated option. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
6f4b1996b4
commit
9695c3af3a
2 changed files with 32 additions and 38 deletions
|
@ -230,14 +230,14 @@ static void test_object_add_failure_modes(void)
|
|||
/* attempt to create 2 objects with duplicate id */
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'size': 1048576 } } }");
|
||||
" 'size': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
g_assert(qdict_haskey(resp, "return"));
|
||||
qobject_unref(resp);
|
||||
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'size': 1048576 } } }");
|
||||
" 'size': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
qmp_expect_error_and_unref(resp, "GenericError");
|
||||
|
||||
|
@ -251,14 +251,14 @@ static void test_object_add_failure_modes(void)
|
|||
/* attempt to create an object with a property of a wrong type */
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'size': '1048576' } } }");
|
||||
" 'size': '1048576' } }");
|
||||
g_assert_nonnull(resp);
|
||||
/* now do it right */
|
||||
qmp_expect_error_and_unref(resp, "GenericError");
|
||||
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'size': 1048576 } } }");
|
||||
" 'size': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
g_assert(qdict_haskey(resp, "return"));
|
||||
qobject_unref(resp);
|
||||
|
@ -273,14 +273,14 @@ static void test_object_add_failure_modes(void)
|
|||
/* attempt to create an object without the id */
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram',"
|
||||
" 'props': {'size': 1048576 } } }");
|
||||
" 'size': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
qmp_expect_error_and_unref(resp, "GenericError");
|
||||
|
||||
/* now do it right */
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'size': 1048576 } } }");
|
||||
" 'size': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
g_assert(qdict_haskey(resp, "return"));
|
||||
qobject_unref(resp);
|
||||
|
@ -295,14 +295,14 @@ static void test_object_add_failure_modes(void)
|
|||
/* attempt to set a non existing property */
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'sized': 1048576 } } }");
|
||||
" 'sized': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
qmp_expect_error_and_unref(resp, "GenericError");
|
||||
|
||||
/* now do it right */
|
||||
resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
|
||||
" {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
|
||||
" 'props': {'size': 1048576 } } }");
|
||||
" 'size': 1048576 } }");
|
||||
g_assert_nonnull(resp);
|
||||
g_assert(qdict_haskey(resp, "return"));
|
||||
qobject_unref(resp);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue