From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Fam Zheng" <famz@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
peterx@redhat.com, "Eric Auger" <eric.auger@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PATCH for-2.12 4/4] tests: partly revert "qmp: introduce QMPCapability"
Date: Fri, 23 Mar 2018 22:08:21 +0800 [thread overview]
Message-ID: <20180323140821.28957-5-peterx@redhat.com> (raw)
In-Reply-To: <20180323140821.28957-1-peterx@redhat.com>
Revert the tests in the patch 02130314d8 ("qmp: introduce
QMPCapability", 2018-03-19) since we'll disable OOB for now.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tests/qmp-test.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index d1fa1cb217..558e83540c 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -80,8 +80,6 @@ static void test_qmp_protocol(void)
QDict *resp, *q, *ret;
QList *capabilities;
QTestState *qts;
- const QListEntry *entry;
- QString *qstr;
qts = qtest_init_without_qmp_handshake(common_args);
@@ -91,13 +89,7 @@ static void test_qmp_protocol(void)
g_assert(q);
test_version(qdict_get(q, "version"));
capabilities = qdict_get_qlist(q, "capabilities");
- g_assert(capabilities);
- entry = qlist_first(capabilities);
- g_assert(entry);
- qstr = qobject_to(QString, entry->value);
- g_assert(qstr);
- g_assert_cmpstr(qstring_get_str(qstr), ==, "oob");
- QDECREF(resp);
+ g_assert(capabilities && qlist_empty(capabilities));
/* Test valid command before handshake */
resp = qtest_qmp(qts, "{ 'execute': 'query-version' }");
--
2.14.3
next prev parent reply other threads:[~2018-03-23 14:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 14:08 [Qemu-devel] [PATCH for-2.12 0/4] Turn OOB off for 2.12-rc1, revert OOB tests Peter Xu
2018-03-23 14:08 ` [Qemu-devel] [PATCH for-2.12 1/4] Revert "monitor: enable IO thread for (qmp & !mux) typed" Peter Xu
2018-03-23 15:49 ` Eric Blake
2018-03-24 1:01 ` Peter Xu
2018-03-23 14:08 ` [Qemu-devel] [PATCH for-2.12 2/4] Revert "tests: qmp-test: add oob test" Peter Xu
2018-03-23 14:08 ` [Qemu-devel] [PATCH for-2.12 3/4] Revert "tests: qmp-test: verify command batching" Peter Xu
2018-03-23 14:08 ` Peter Xu [this message]
2018-03-23 14:15 ` [Qemu-devel] [PATCH for-2.12 0/4] Turn OOB off for 2.12-rc1, revert OOB tests Peter Xu
2018-03-23 14:33 ` Christian Borntraeger
2018-03-23 15:42 ` Eric Blake
2018-03-23 15:53 ` Eric Blake
2018-03-23 17:17 ` Eric Blake
2018-03-23 18:30 ` Christian Borntraeger
2018-03-23 18:36 ` Eric Blake
2018-03-24 0:52 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180323140821.28957-5-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=eblake@redhat.com \
--cc=eric.auger@redhat.com \
--cc=famz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).