aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-02-28 22:26:54 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-03-07 16:07:47 +0100
commit99dbfd1db1110f579f47b40155b9bf750d2cd6ad (patch)
tree8916e2a33a9a7c53f72fbff8f7df6d0fb61a74f2 /tests
parente3934b429760d788458d02bc4cad57d1c6a46ce7 (diff)
qobject: Propagate parse errors through qobject_from_jsonv()
The next few commits will put the errors to use where appropriate. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <1488317230-26248-9-git-send-email-armbru@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/libqtest.c2
-rw-r--r--tests/test-qobject-input-visitor.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c
index ca6b641963..9033c5f82c 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -442,7 +442,7 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
* is an array type.
*/
va_copy(ap_copy, ap);
- qobj = qobject_from_jsonv(fmt, &ap_copy);
+ qobj = qobject_from_jsonv(fmt, &ap_copy, NULL);
va_end(ap_copy);
/* No need to send anything for an empty QObject. */
diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c
index 32ba492a1a..36cc4b539e 100644
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -51,7 +51,7 @@ static Visitor *visitor_input_test_init_internal(TestInputVisitorData *data,
{
visitor_input_teardown(data, NULL);
- data->obj = qobject_from_jsonv(json_string, ap);
+ data->obj = qobject_from_jsonv(json_string, ap, NULL);
g_assert(data->obj);
if (keyval) {