[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/16] tests/qtest/readconfig: Rework test_object_rng_resp into a
From: |
Thomas Huth |
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 |
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
- [PULL 00/16] Final tests, s390x and misc updates before the soft freeze, Thomas Huth, 2023/03/06
- [PULL 06/16] gitlab-ci.d/crossbuilds: Drop the i386 system emulation job, Thomas Huth, 2023/03/06
- [PULL 09/16] tests/qtest/readconfig: Rework test_object_rng_resp into a generic function,
Thomas Huth <=
- [PULL 11/16] docs/config: Set the "kvm" accelerator via "[accel]" section, Thomas Huth, 2023/03/06
- [PULL 07/16] docs/about/deprecated: Deprecate 32-bit arm hosts for system emulation, Thomas Huth, 2023/03/06
- [PULL 02/16] Hexagon (meson.build): define min bison version, Thomas Huth, 2023/03/06
- [PULL 01/16] docs/about/build-platforms: Refine the distro support policy, Thomas Huth, 2023/03/06
- [PULL 03/16] test: Check vnc enable before compiling vnc test, Thomas Huth, 2023/03/06
- [PULL 10/16] tests/qtest/readconfig: Test docs/config/ich9-ehci-uhci.cfg, Thomas Huth, 2023/03/06
- [PULL 12/16] tests/qtest/readconfig-test: Allow testing for arbitrary memory sizes, Thomas Huth, 2023/03/06
- [PULL 13/16] tests/qtest: Move mkimg() and have_qemu_img() from libqos to libqtest, Thomas Huth, 2023/03/06
- [PULL 08/16] gitlab-ci.d/crossbuilds: Drop the 32-bit arm system emulation jobs, Thomas Huth, 2023/03/06
- [PULL 05/16] docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation, Thomas Huth, 2023/03/06