From nobody Sat Oct 25 08:28:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518607814523532.790490771302; Wed, 14 Feb 2018 03:30:14 -0800 (PST) Received: from localhost ([::1]:37568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elvGI-0006GN-My for importer@patchew.org; Wed, 14 Feb 2018 06:30:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elv7P-0006MR-VS for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:20:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elv7O-0007Bg-Py for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:20:55 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57174 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elv7O-0007BT-Kl for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:20:54 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47E67EAE91; Wed, 14 Feb 2018 11:20:54 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-136.ams2.redhat.com [10.36.116.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99B1A2024CA4; Wed, 14 Feb 2018 11:20:52 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Wed, 14 Feb 2018 12:20:25 +0100 Message-Id: <1518607234-17739-10-git-send-email-thuth@redhat.com> In-Reply-To: <1518607234-17739-1-git-send-email-thuth@redhat.com> References: <1518607234-17739-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 14 Feb 2018 11:20:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 14 Feb 2018 11:20:54 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 09/18] qmp-test: Drop dependence on global_qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake As a general rule, we prefer avoiding implicit global state because it makes code harder to safely copy and paste without thinking about the global state. Although qmp-test does not maintain parallel qtest connections, it was the last test assigning to global_qtest. It's just as easy to be explicit about the state; once all tests have been cleaned up, a later patch can then get rid of global_qtest and a layer of wrappers in libqtest. Signed-off-by: Eric Blake Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qmp-test.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 908f9b9..5808483 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -43,32 +43,32 @@ static void test_version(QObject *version) visit_free(v); } =20 -static void test_malformed(void) +static void test_malformed(QTestState *qts) { QDict *resp; =20 /* Not even a dictionary */ - resp =3D qmp("null"); + resp =3D qtest_qmp(qts, "null"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); QDECREF(resp); =20 /* No "execute" key */ - resp =3D qmp("{}"); + resp =3D qtest_qmp(qts, "{}"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); QDECREF(resp); =20 /* "execute" isn't a string */ - resp =3D qmp("{ 'execute': true }"); + resp =3D qtest_qmp(qts, "{ 'execute': true }"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); QDECREF(resp); =20 /* "arguments" isn't a dictionary */ - resp =3D qmp("{ 'execute': 'no-such-cmd', 'arguments': [] }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'no-such-cmd', 'arguments': [] }= "); g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); QDECREF(resp); =20 /* extra key */ - resp =3D qmp("{ 'execute': 'no-such-cmd', 'extra': true }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'no-such-cmd', 'extra': true }"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); QDECREF(resp); } @@ -77,11 +77,12 @@ static void test_qmp_protocol(void) { QDict *resp, *q, *ret; QList *capabilities; + QTestState *qts; =20 - global_qtest =3D qtest_init_without_qmp_handshake(common_args); + qts =3D qtest_init_without_qmp_handshake(common_args); =20 /* Test greeting */ - resp =3D qmp_receive(); + resp =3D qtest_qmp_receive(qts); q =3D qdict_get_qdict(resp, "QMP"); g_assert(q); test_version(qdict_get(q, "version")); @@ -90,46 +91,46 @@ static void test_qmp_protocol(void) QDECREF(resp); =20 /* Test valid command before handshake */ - resp =3D qmp("{ 'execute': 'query-version' }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'query-version' }"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "CommandNotFound"); QDECREF(resp); =20 /* Test malformed commands before handshake */ - test_malformed(); + test_malformed(qts); =20 /* Test handshake */ - resp =3D qmp("{ 'execute': 'qmp_capabilities' }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'qmp_capabilities' }"); ret =3D qdict_get_qdict(resp, "return"); g_assert(ret && !qdict_size(ret)); QDECREF(resp); =20 /* Test repeated handshake */ - resp =3D qmp("{ 'execute': 'qmp_capabilities' }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'qmp_capabilities' }"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "CommandNotFound"); QDECREF(resp); =20 /* Test valid command */ - resp =3D qmp("{ 'execute': 'query-version' }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'query-version' }"); test_version(qdict_get(resp, "return")); QDECREF(resp); =20 /* Test malformed commands */ - test_malformed(); + test_malformed(qts); =20 /* Test 'id' */ - resp =3D qmp("{ 'execute': 'query-name', 'id': 'cookie#1' }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'query-name', 'id': 'cookie#1' }= "); ret =3D qdict_get_qdict(resp, "return"); g_assert(ret); g_assert_cmpstr(qdict_get_try_str(resp, "id"), =3D=3D, "cookie#1"); QDECREF(resp); =20 /* Test command failure with 'id' */ - resp =3D qmp("{ 'execute': 'human-monitor-command', 'id': 2 }"); + resp =3D qtest_qmp(qts, "{ 'execute': 'human-monitor-command', 'id': 2= }"); g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); g_assert_cmpint(qdict_get_int(resp, "id"), =3D=3D, 2); QDECREF(resp); =20 - qtest_end(); + qtest_quit(qts); } =20 static int query_error_class(const char *cmd) --=20 1.8.3.1