From nobody Tue Feb 10 13:34:35 2026 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109527; cv=none; d=zohomail.com; s=zohoarc; b=aY2vUWstK8GHmMdSXV/sR3qe06aWK0wsYQ/62Ij1Jubd3V36MwGJh/6OFMSzLnTtL4N0gnxfKvPXqqk8GvYJpFw77KcKVye61NuAnm9CBYkGOxFLt0at6EajJxwAvpzDwVVa6jToJJGq100FdmNL80URJWt9AWs5HS17os4HO2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109527; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j74eENbG/i42s9LMh45ehsEHaqHqVmuXLEJtRm2Y1mU=; b=Q1xeVZ8W9QgRg5Bpwg1O5exdxnLhSGABAJWpJyfzx25IxGO/5I+tnOnjOWZtAYriSHIKaG5czG2WgvcWerNtjy5JVlVNpOFGc1Fu4S5I3rs/tWxHlQf8npAJafXojzGWZZZy+S0kDAClB52oMpeOG38pQdDkw4aDf3h+JJYmkLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678109527402212.2622025152731; Mon, 6 Mar 2023 05:32:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvw-0002vA-8Q; Mon, 06 Mar 2023 08:31:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuy-0002FX-3T for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuw-0007Tu-3E for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:19 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-hNdGmYoROL-usFCE3iBkdA-1; Mon, 06 Mar 2023 08:30:13 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBBCD1C05B0A; Mon, 6 Mar 2023 13:30:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E5DF40C10FA; Mon, 6 Mar 2023 13:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j74eENbG/i42s9LMh45ehsEHaqHqVmuXLEJtRm2Y1mU=; b=JynyrENfMSDpOAcCJ6gWU9cEsBxOx7ydAyl61khJBaLgRfnPMinUPTa75HuSnrY/HeWsl2 W6m+Vg+MY5v1Ep6C0PtJ+7DlJh71s+Ev9yahs4+RN5X+948iMOS+NwSmqx9gwjNDmhTvIJ NuK34YQ5aBQvSH/ULBEEuP5oSqxfG60= X-MC-Unique: hNdGmYoROL-usFCE3iBkdA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell 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 Message-Id: <20230306133002.418421-10-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109529625100003 Content-Type: text/plain; charset="utf-8" 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 --- 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 =20 -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 =3D NULL; ObjectPropertyInfoList *tmp; ObjectPropertyInfo *obj; - bool seen_rng =3D false; + bool object_available =3D false; + g_autofree char *childtype =3D g_strdup_printf("child<%s>", type); =20 g_assert(res); v =3D qobject_input_visitor_new(res); @@ -142,16 +144,15 @@ static void test_object_rng_resp(QObject *res) g_assert(tmp->value); =20 obj =3D tmp->value; - if (g_str_equal(obj->name, "rng0") && - g_str_equal(obj->type, "child")) { - seen_rng =3D true; + if (g_str_equal(obj->name, name) && g_str_equal(obj->type, childty= pe)) { + object_available =3D true; break; } =20 tmp =3D tmp->next; } =20 - g_assert(seen_rng); + g_assert(object_available); =20 visit_free(v); } @@ -170,7 +171,7 @@ static void test_object_rng(void) resp =3D 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); =20 qtest_quit(qts); --=20 2.31.1