Commit 6a5c88f5 authored by Eric Blake's avatar Eric Blake Committed by Thomas Huth
Browse files

qmp-test: Drop dependence on global_qtest 



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: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 3d95fb97

tests/qmp-test.c

+18 −17
Original line number Diff line number Diff line
@@ -43,32 +43,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);

}
@@ -77,11 +77,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"));
@@ -90,46 +91,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)