diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-17 21:38:19 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-22 19:52:04 +0100 |
| commit | cd17ba51f5b25196c52afe5dfdd27c7dc8621cf4 (patch) | |
| tree | 7ce3627269395604b384f8aede7ffaf57a7ec203 | |
| parent | ca6b6e1e68ac44b2e8895da10dd1c80dc03d08b7 (diff) | |
| download | focaccia-qemu-cd17ba51f5b25196c52afe5dfdd27c7dc8621cf4.tar.gz focaccia-qemu-cd17ba51f5b25196c52afe5dfdd27c7dc8621cf4.zip | |
tests: Don't check qobject_type() before qobject_to_qlist()
qobject_to_qlist(obj) returns NULL when obj isn't a QList. Check that instead of qobject_type(obj) == QTYPE_QLIST. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1487363905-9480-9-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | tests/test-qobject-output-visitor.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index a87438613f..13a0a9b3ac 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -261,7 +261,6 @@ static void test_visitor_out_list(TestOutputVisitorData *data, bool value_bool = true; int value_int = 10; QListEntry *entry; - QObject *obj; QList *qlist; int i; @@ -279,10 +278,8 @@ static void test_visitor_out_list(TestOutputVisitorData *data, visit_type_TestStructList(data->ov, NULL, &head, &error_abort); - obj = visitor_get(data); - g_assert(qobject_type(obj) == QTYPE_QLIST); - - qlist = qobject_to_qlist(obj); + qlist = qobject_to_qlist(visitor_get(data)); + g_assert(qlist); g_assert(!qlist_empty(qlist)); /* ...and ensure that the visitor sees it in order */ |