qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 05/16] check-qdict: Tighten qdict_crumple_test_recursive() some
Date: Wed, 22 Feb 2017 20:14:47 +0100	[thread overview]
Message-ID: <1487790898-24921-6-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1487790898-24921-1-git-send-email-armbru@redhat.com>

Consistently check for unexpected QDict entries, and qdict_get_qdict()
success.  The latter doesn't tighten the test, it only makes it fail
more nicely.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1487363905-9480-4-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 tests/check-qdict.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 14e942a..ded3a26 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -615,26 +615,31 @@ static void qdict_crumple_test_recursive(void)
 
     vnc = qdict_get_qdict(dst, "vnc");
     g_assert(vnc);
+    g_assert_cmpint(qdict_size(vnc), ==, 3);
 
     listen = qdict_get_qdict(vnc, "listen");
     g_assert(listen);
+    g_assert_cmpint(qdict_size(listen), ==, 2);
     g_assert_cmpstr("127.0.0.1", ==, qdict_get_str(listen, "addr"));
     g_assert_cmpstr("5901", ==, qdict_get_str(listen, "port"));
 
     acl = qdict_get_qdict(vnc, "acl");
     g_assert(acl);
+    g_assert_cmpint(qdict_size(acl), ==, 3);
 
     rules = qdict_get_qlist(acl, "rules");
     g_assert(rules);
     g_assert_cmpint(qlist_size(rules), ==, 2);
 
     rule = qobject_to_qdict(qlist_pop(rules));
+    g_assert(rule);
     g_assert_cmpint(qdict_size(rule), ==, 2);
     g_assert_cmpstr("fred", ==, qdict_get_str(rule, "match"));
     g_assert_cmpstr("allow", ==, qdict_get_str(rule, "policy"));
     QDECREF(rule);
 
     rule = qobject_to_qdict(qlist_pop(rules));
+    g_assert(rule);
     g_assert_cmpint(qdict_size(rule), ==, 2);
     g_assert_cmpstr("bob", ==, qdict_get_str(rule, "match"));
     g_assert_cmpstr("deny", ==, qdict_get_str(rule, "policy"));
-- 
2.7.4

  parent reply	other threads:[~2017-02-22 19:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-22 19:14 [Qemu-devel] [PULL 00/16] QAPI patches for 2017-02-22 Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 01/16] numa: Flatten simple union NumaOptions Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 02/16] net: Flatten simple union NetLegacyOptions Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 03/16] qdict: Make qdict_get_qlist() safe like qdict_get_qdict() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 04/16] check-qdict: Simplify qdict_crumple_test_recursive() Markus Armbruster
2017-02-22 19:14 ` Markus Armbruster [this message]
2017-02-22 19:14 ` [Qemu-devel] [PULL 06/16] check-qjson: Simplify around compare_litqobj_to_qobj() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 07/16] libqtest: Clean up qmp_response() a bit Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 08/16] test-qmp-event: Simplify and tighten event_test_emit() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 09/16] Don't check qobject_type() before qobject_to_qdict() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 10/16] tests: Don't check qobject_type() before qobject_to_qlist() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 11/16] tests: Don't check qobject_type() before qobject_to_qstring() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 12/16] tests: Don't check qobject_type() before qobject_to_qint() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 13/16] tests: Don't check qobject_type() before qobject_to_qfloat() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 14/16] tests: Don't check qobject_type() before qobject_to_qbool() Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 15/16] monitor: Clean up handle_hmp_command() a bit Markus Armbruster
2017-02-22 19:14 ` [Qemu-devel] [PULL 16/16] block: Don't bother asserting type of output visitor's output Markus Armbruster
2017-02-24 17:27 ` [Qemu-devel] [PULL 00/16] QAPI patches for 2017-02-22 Peter Maydell

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=1487790898-24921-6-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=qemu-devel@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).