diff options
| author | Peter Maydell | 2018-12-13 14:41:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-12-13 14:41:44 +0100 |
| commit | c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07 (patch) | |
| tree | 8de8111f4fffb7c3bc3e5b12ad72105c7206cd1c /tests/qmp-test.c | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181212' into staging (diff) | |
| parent | tests: add oob functional test for test-qmp-cmds (diff) | |
| download | qemu-c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07.tar.gz qemu-c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07.tar.xz qemu-c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-12-12' into staging
Monitor patches for 2018-12-12
# gpg: Signature made Wed 12 Dec 2018 10:08:15 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-monitor-2018-12-12:
tests: add oob functional test for test-qmp-cmds
Revert "tests: Add parameter to qtest_init_without_qmp_handshake"
monitor: Remove "x-oob", offer capability "oob" unconditionally
monitor: Suspend monitor instead dropping commands
monitor: avoid potential dead-lock when cleaning up
monitor: prevent inserting new monitors after cleanup
colo: check chardev can switch context
monitor: check if chardev can switch gcontext for OOB
char: add a QEMU_CHAR_FEATURE_GCONTEXT flag
monitor: accept chardev input from iothread
monitor: inline ambiguous helper functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qmp-test.c')
| -rw-r--r-- | tests/qmp-test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 7517be4654..48a4fa791a 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -108,7 +108,7 @@ static void test_qmp_protocol(void) QList *capabilities; QTestState *qts; - qts = qtest_init_without_qmp_handshake(false, common_args); + qts = qtest_init_without_qmp_handshake(common_args); /* Test greeting */ resp = qtest_qmp_receive(qts); @@ -116,7 +116,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 && qlist_empty(capabilities)); + g_assert(capabilities); qobject_unref(resp); /* Test valid command before handshake */ @@ -219,7 +219,7 @@ static void test_qmp_oob(void) QList *capabilities; QString *qstr; - qts = qtest_init_without_qmp_handshake(true, common_args); + qts = qtest_init_without_qmp_handshake(common_args); /* Check the greeting message. */ resp = qtest_qmp_receive(qts); |