From nobody Fri Nov 14 03:46:57 2025 Delivered-To: importer@patchew.org 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584446252; cv=none; d=zohomail.com; s=zohoarc; b=DaYY0BNo/v3/lHK2RSrmztjUxIL1Ilhc3SLC/vRSgrFoFfVGbJ9hFTmPbqmfW4bF4FbVA6llHgm76HPRMnsLtF3EeBGbiv1BQNh+6qHNmhva0EAVDBxgcwGv0Kp3TkI8AQOE15BonHfjqstPqwTukyj5TRR6FQehH1doDj48sRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584446252; h=Content-Type:Content-Transfer-Encoding:Cc: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=EZNBiYwCYvb6dGx1F/O1ypA8W1wWLGTL3UO2PfGa0Ns=; b=mnQKEsUC9dsszhxW+ej8ADcOWwyQyIBIM0xsH+BbY+TZCQbjmmbK7HsQcBhmX1gJymkPNB6ZwsgdvRfMf5xtFCRv8RanvTsFGw3wRBW5qjUSxiexCiEhR1V9Y9A9ieuOjRr72FHRi3Rc3c4sgfhuHpZZflPs3HEC3iVyqRg5S7I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584446252834359.17056755209524; Tue, 17 Mar 2020 04:57:32 -0700 (PDT) Received: from localhost ([::1]:59650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAqh-0003Er-QD for importer@patchew.org; Tue, 17 Mar 2020 07:57:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56661) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAoT-0007ws-6g for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:55:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAoR-00060L-SL for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:55:13 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:52112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEAoR-0005xI-Nl for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:55:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-ZMfyunm-NSGkEJM_pcNdKg-1; Tue, 17 Mar 2020 07:55:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6D04DBB9; Tue, 17 Mar 2020 11:55:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-130.ams2.redhat.com [10.36.112.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC63E5DE56; Tue, 17 Mar 2020 11:55:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 09A2211366DB; Tue, 17 Mar 2020 12:55:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584446111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EZNBiYwCYvb6dGx1F/O1ypA8W1wWLGTL3UO2PfGa0Ns=; b=AZ216wDJcHjfnV1NHTtacW6O7RfOoM1VDNnR7kJb4vcLkb2iSY6TMuHtgdUGl8s+Hpkq08 EC3TSd6hXjEAJ8bd1xeexR3kjV5kv472zrKXA90GqLbu31JDhjz5IB7TRj3Rk5e4gu+09N DiaZQd4D6kwo1xkEENn3HJYMkc0npso= X-MC-Unique: ZMfyunm-NSGkEJM_pcNdKg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v4 06/34] tests/test-qmp-cmds: Check responses more thoroughly Date: Tue, 17 Mar 2020 12:54:31 +0100 Message-Id: <20200317115459.31821-7-armbru@redhat.com> In-Reply-To: <20200317115459.31821-1-armbru@redhat.com> References: <20200317115459.31821-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@gmail.com, mdroth@linux.vnet.ibm.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- tests/test-qmp-cmds.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index fb18475c7e..1563556e7c 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -151,9 +151,10 @@ static QObject *do_qmp_dispatch(QDict *req, bool allow= _oob) QObject *ret; =20 resp =3D qmp_dispatch(&qmp_commands, QOBJECT(req), allow_oob); - g_assert(resp && !qdict_haskey(resp, "error")); + g_assert(resp); ret =3D qdict_get(resp, "return"); g_assert(ret); + g_assert(qdict_size(resp) =3D=3D 1); =20 qobject_ref(ret); qobject_unref(resp); @@ -163,9 +164,17 @@ static QObject *do_qmp_dispatch(QDict *req, bool allow= _oob) static void do_qmp_dispatch_error(QDict *req, bool allow_oob, ErrorClass c= ls) { QDict *resp; + QDict *error; =20 resp =3D qmp_dispatch(&qmp_commands, QOBJECT(req), allow_oob); - g_assert(resp && qdict_haskey(resp, "error")); + g_assert(resp); + error =3D qdict_get_qdict(resp, "error"); + g_assert(error); + g_assert_cmpstr(qdict_get_try_str(error, "class"), + =3D=3D, QapiErrorClass_str(cls)); + g_assert(qdict_get_try_str(error, "desc")); + g_assert(qdict_size(error) =3D=3D 2); + g_assert(qdict_size(resp) =3D=3D 1); =20 qobject_unref(resp); } @@ -174,11 +183,12 @@ static void do_qmp_dispatch_error(QDict *req, bool al= low_oob, ErrorClass cls) static void test_dispatch_cmd(void) { QDict *req =3D qdict_new(); - QObject *ret; + QDict *ret; =20 qdict_put_str(req, "execute", "user_def_cmd"); =20 - ret =3D do_qmp_dispatch(req, false); + ret =3D qobject_to(QDict, do_qmp_dispatch(req, false)); + assert(ret && qdict_size(ret) =3D=3D 0); =20 qobject_unref(ret); qobject_unref(req); @@ -187,11 +197,12 @@ static void test_dispatch_cmd(void) static void test_dispatch_cmd_oob(void) { QDict *req =3D qdict_new(); - QObject *ret; + QDict *ret; =20 qdict_put_str(req, "exec-oob", "test-flags-command"); =20 - ret =3D do_qmp_dispatch(req, true); + ret =3D qobject_to(QDict, do_qmp_dispatch(req, true)); + assert(ret && qdict_size(ret) =3D=3D 0); =20 qobject_unref(ret); qobject_unref(req); --=20 2.21.1