From cc797607c03722871a030f8a64d800a8df93b5b2 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Fri, 23 Mar 2018 22:08:20 +0800 Subject: [PATCH] Revert "tests: qmp-test: verify command batching" This reverts commit 91ad45061af0fe44ac5dadb5bedaf4d7a08077c8. Enabling OOB caused several iotests failures; due to the imminent 2.12 release, the safest action is to disable OOB, but first we have to revert tests that rely on OOB. Signed-off-by: Peter Xu Message-Id: <20180323140821.28957-4-peterx@redhat.com> Tested-by: Christian Borntraeger [eblake: reorder commits, enhance commit message] Signed-off-by: Eric Blake --- tests/qmp-test.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 2e4b599a4c..d1fa1cb217 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -82,7 +82,6 @@ static void test_qmp_protocol(void) QTestState *qts; const QListEntry *entry; QString *qstr; - int i; qts = qtest_init_without_qmp_handshake(common_args); @@ -140,27 +139,6 @@ static void test_qmp_protocol(void) g_assert_cmpint(qdict_get_int(resp, "id"), ==, 2); QDECREF(resp); - /* - * Test command batching. In current test OOB is not enabled, we - * should be able to run as many commands in batch as we like. - * Using 16 (>8, which is OOB queue length) to make sure OOB won't - * break existing clients. Note: this test does not control the - * scheduling of QEMU's QMP command processing threads so it may - * not really trigger batching inside QEMU. This is just a - * best-effort test. - */ - for (i = 0; i < 16; i++) { - qtest_async_qmp(qts, "{ 'execute': 'query-version' }"); - } - /* Verify the replies to make sure no command is dropped. */ - for (i = 0; i < 16; i++) { - resp = qtest_qmp_receive(qts); - /* It should never be dropped. Each of them should be a reply. */ - g_assert(qdict_haskey(resp, "return")); - g_assert(!qdict_haskey(resp, "event")); - QDECREF(resp); - } - qtest_quit(qts); } -- 2.11.4.GIT