qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 09/16] tests/qtest/readconfig: Rework test_object_rng_resp into a generic function
Date: Mon,  6 Mar 2023 14:29:55 +0100	[thread overview]
Message-ID: <20230306133002.418421-10-thuth@redhat.com> (raw)
In-Reply-To: <20230306133002.418421-1-thuth@redhat.com>

test_object_rng_resp() can be reworked quite easily to allow
testing for arbitrary objects in the qom-list response.

Message-Id: <20230228211533.201837-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/readconfig-test.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
index 9ef870643d..26d79b5e4b 100644
--- a/tests/qtest/readconfig-test.c
+++ b/tests/qtest/readconfig-test.c
@@ -124,13 +124,15 @@ static void test_spice(void)
 }
 #endif
 
-static void test_object_rng_resp(QObject *res)
+static void test_object_available(QObject *res, const char *name,
+                                  const char *type)
 {
     Visitor *v;
     g_autoptr(ObjectPropertyInfoList) objs = NULL;
     ObjectPropertyInfoList *tmp;
     ObjectPropertyInfo *obj;
-    bool seen_rng = false;
+    bool object_available = false;
+    g_autofree char *childtype = g_strdup_printf("child<%s>", type);
 
     g_assert(res);
     v = qobject_input_visitor_new(res);
@@ -142,16 +144,15 @@ static void test_object_rng_resp(QObject *res)
         g_assert(tmp->value);
 
         obj = tmp->value;
-        if (g_str_equal(obj->name, "rng0") &&
-            g_str_equal(obj->type, "child<rng-builtin>")) {
-            seen_rng = true;
+        if (g_str_equal(obj->name, name) && g_str_equal(obj->type, childtype)) {
+            object_available = true;
             break;
         }
 
         tmp = tmp->next;
     }
 
-    g_assert(seen_rng);
+    g_assert(object_available);
 
     visit_free(v);
 }
@@ -170,7 +171,7 @@ static void test_object_rng(void)
     resp = qtest_qmp(qts,
                      "{ 'execute': 'qom-list',"
                      "  'arguments': {'path': '/objects' }}");
-    test_object_rng_resp(qdict_get(resp, "return"));
+    test_object_available(qdict_get(resp, "return"), "rng0", "rng-builtin");
     qobject_unref(resp);
 
     qtest_quit(qts);
-- 
2.31.1



  parent reply	other threads:[~2023-03-06 13:32 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-06 13:29 [PULL 00/16] Final tests, s390x and misc updates before the soft freeze Thomas Huth
2023-03-06 13:29 ` [PULL 01/16] docs/about/build-platforms: Refine the distro support policy Thomas Huth
2023-03-06 13:29 ` [PULL 02/16] Hexagon (meson.build): define min bison version Thomas Huth
2023-03-06 13:29 ` [PULL 03/16] test: Check vnc enable before compiling vnc test Thomas Huth
2023-03-06 13:29 ` [PULL 04/16] include/hw/i386: Clean up includes in x86.h Thomas Huth
2023-03-06 13:29 ` [PULL 05/16] docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation Thomas Huth
2023-03-06 13:29 ` [PULL 06/16] gitlab-ci.d/crossbuilds: Drop the i386 system emulation job Thomas Huth
2023-03-06 13:29 ` [PULL 07/16] docs/about/deprecated: Deprecate 32-bit arm hosts for system emulation Thomas Huth
2023-03-06 13:29 ` [PULL 08/16] gitlab-ci.d/crossbuilds: Drop the 32-bit arm system emulation jobs Thomas Huth
2023-03-06 13:29 ` Thomas Huth [this message]
2023-03-06 13:29 ` [PULL 10/16] tests/qtest/readconfig: Test docs/config/ich9-ehci-uhci.cfg Thomas Huth
2023-03-06 13:29 ` [PULL 11/16] docs/config: Set the "kvm" accelerator via "[accel]" section Thomas Huth
2023-03-06 13:29 ` [PULL 12/16] tests/qtest/readconfig-test: Allow testing for arbitrary memory sizes Thomas Huth
2023-03-06 13:29 ` [PULL 13/16] tests/qtest: Move mkimg() and have_qemu_img() from libqos to libqtest Thomas Huth
2023-03-06 13:30 ` [PULL 14/16] tests/qtest/readconfig: Test docs/config/q35-emulated.cfg Thomas Huth
2023-03-06 13:30 ` [PULL 15/16] pc-bios: Add support for List-Directed IPL from ECKD DASD Thomas Huth
2023-03-06 13:30 ` [PULL 16/16] pc-bios/s390-ccw: Update s390-ccw.img with the list-directed IPL fix Thomas Huth
2023-03-07  9:57 ` [PULL 00/16] Final tests, s390x and misc updates before the soft freeze Peter Maydell
2023-03-07 11:50   ` Thomas Huth

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=20230306133002.418421-10-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).