diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 12:29:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 12:29:14 +0100 |
| commit | f69d20fa8badbd6b515cc3d9e0a95b36f0410a46 (patch) | |
| tree | b6e37a862c8603fbf3f4d3b66fac27417a35d7d5 /tests | |
| parent | 2f831d04985f064e9306fa58db516e0a3e1df918 (diff) | |
| parent | 1e960b46024d468e76d2f42ddcfa5a9d521db492 (diff) | |
| download | qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.zip qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.tar.gz qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-09-24' into staging
QObject patches for 2018-09-24
# gpg: Signature made Mon 24 Sep 2018 17:09:58 BST
# 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-qobject-2018-09-24:
json: Eliminate lexer state IN_WHITESPACE, pseudo-token JSON_SKIP
json: Eliminate lexer state IN_ERROR
json: Nicer recovery from lexical errors
json: Make lexer's "character consumed" logic less confusing
json: Clean up how lexer consumes "end of input"
json: Fix lexer for lookahead character beyond '\x7F'
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmp-test.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/qmp-test.c b/tests/qmp-test.c index b347228..6c419f6 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -76,10 +76,7 @@ static void test_malformed(QTestState *qts) assert_recovered(qts); /* lexical error: interpolation */ - qtest_qmp_send_raw(qts, "%%p\n"); - /* two errors, one for "%", one for "p" */ - resp = qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qtest_qmp_send_raw(qts, "%%p"); resp = qtest_qmp_receive(qts); qmp_assert_error_class(resp, "GenericError"); assert_recovered(qts); |