[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/14] qmp-test: Drop dependence on global_qtest
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PATCH 09/14] qmp-test: Drop dependence on global_qtest |
Date: |
Thu, 8 Feb 2018 21:09:37 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
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 36feb22..db34c45 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -41,32 +41,32 @@ static void test_version(QObject *version)
visit_free(v);
}
-static void test_malformed(void)
+static void test_malformed(QTestState *qts)
{
QDict *resp;
/* Not even a dictionary */
- resp = qmp("null");
+ resp = qtest_qmp(qts, "null");
g_assert_cmpstr(get_error_class(resp), ==, "GenericError");
QDECREF(resp);
/* No "execute" key */
- resp = qmp("{}");
+ resp = qtest_qmp(qts, "{}");
g_assert_cmpstr(get_error_class(resp), ==, "GenericError");
QDECREF(resp);
/* "execute" isn't a string */
- resp = qmp("{ 'execute': true }");
+ resp = qtest_qmp(qts, "{ 'execute': true }");
g_assert_cmpstr(get_error_class(resp), ==, "GenericError");
QDECREF(resp);
/* "arguments" isn't a dictionary */
- resp = qmp("{ 'execute': 'no-such-cmd', 'arguments': [] }");
+ resp = qtest_qmp(qts, "{ 'execute': 'no-such-cmd', 'arguments': [] }");
g_assert_cmpstr(get_error_class(resp), ==, "GenericError");
QDECREF(resp);
/* extra key */
- resp = qmp("{ 'execute': 'no-such-cmd', 'extra': true }");
+ resp = qtest_qmp(qts, "{ 'execute': 'no-such-cmd', 'extra': true }");
g_assert_cmpstr(get_error_class(resp), ==, "GenericError");
QDECREF(resp);
}
@@ -75,11 +75,12 @@ static void test_qmp_protocol(void)
{
QDict *resp, *q, *ret;
QList *capabilities;
+ QTestState *qts;
- global_qtest = qtest_init_without_qmp_handshake(common_args);
+ qts = qtest_init_without_qmp_handshake(common_args);
/* Test greeting */
- resp = qmp_receive();
+ resp = qtest_qmp_receive(qts);
q = qdict_get_qdict(resp, "QMP");
g_assert(q);
test_version(qdict_get(q, "version"));
@@ -88,46 +89,46 @@ static void test_qmp_protocol(void)
QDECREF(resp);
/* Test valid command before handshake */
- resp = qmp("{ 'execute': 'query-version' }");
+ resp = qtest_qmp(qts, "{ 'execute': 'query-version' }");
g_assert_cmpstr(get_error_class(resp), ==, "CommandNotFound");
QDECREF(resp);
/* Test malformed commands before handshake */
- test_malformed();
+ test_malformed(qts);
/* Test handshake */
- resp = qmp("{ 'execute': 'qmp_capabilities' }");
+ resp = qtest_qmp(qts, "{ 'execute': 'qmp_capabilities' }");
ret = qdict_get_qdict(resp, "return");
g_assert(ret && !qdict_size(ret));
QDECREF(resp);
/* Test repeated handshake */
- resp = qmp("{ 'execute': 'qmp_capabilities' }");
+ resp = qtest_qmp(qts, "{ 'execute': 'qmp_capabilities' }");
g_assert_cmpstr(get_error_class(resp), ==, "CommandNotFound");
QDECREF(resp);
/* Test valid command */
- resp = qmp("{ 'execute': 'query-version' }");
+ resp = qtest_qmp(qts, "{ 'execute': 'query-version' }");
test_version(qdict_get(resp, "return"));
QDECREF(resp);
/* Test malformed commands */
- test_malformed();
+ test_malformed(qts);
/* Test 'id' */
- resp = qmp("{ 'execute': 'query-name', 'id': 'cookie#1' }");
+ resp = qtest_qmp(qts, "{ 'execute': 'query-name', 'id': 'cookie#1' }");
ret = qdict_get_qdict(resp, "return");
g_assert(ret);
g_assert_cmpstr(qdict_get_try_str(resp, "id"), ==, "cookie#1");
QDECREF(resp);
/* Test command failure with 'id' */
- resp = qmp("{ 'execute': 'human-monitor-command', 'id': 2 }");
+ resp = qtest_qmp(qts, "{ 'execute': 'human-monitor-command', 'id': 2 }");
g_assert_cmpstr(get_error_class(resp), ==, "GenericError");
g_assert_cmpint(qdict_get_int(resp, "id"), ==, 2);
QDECREF(resp);
- qtest_end();
+ qtest_quit(qts);
}
static int query_error_class(const char *cmd)
--
1.8.3.1
- [Qemu-devel] [PATCH 00/14] qtest patches, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 01/14] tests: Clean up wait for event, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 02/14] libqtest: Use qemu_strtoul(), Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 03/14] libqos: Track QTestState with QPCIBus, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 04/14] libqos: Use explicit QTestState for fw_cfg operations, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 05/14] libqos: Use explicit QTestState for rtas operations, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 07/14] libqos: Use explicit QTestState for ahci operations, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 06/14] libqos: Use explicit QTestState for i2c operations, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 08/14] libqos: Use explicit QTestState for remaining libqos operations, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 09/14] qmp-test: Drop dependence on global_qtest,
Thomas Huth <=
- [Qemu-devel] [PATCH 10/14] tests/boot-sector: Drop dependence on global_qtest, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 11/14] wdt_ib700-test: Drop dependence on global_qtest, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 13/14] tests/boot-serial: Add tests for PowerPC Mac machines, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 14/14] tests/boot-serial-test: Add support for the aarch64 virt machine, Thomas Huth, 2018/02/08
- [Qemu-devel] [PATCH 12/14] tests/boot-serial: Enable the boot-serial test on SPARC machines, too, Thomas Huth, 2018/02/08
- Re: [Qemu-devel] [PATCH 00/14] qtest patches, Eric Blake, 2018/02/08