diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-08-31 17:28:52 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-09-04 15:47:16 +0200 |
| commit | c6b71e5ae73802057d700e2419b80aef1651f213 (patch) | |
| tree | e4d4d8726fe026754e3d731edada45c2f8013145 /tests | |
| parent | 10689e36eb99e99751497ac8cef2a946e9a3a850 (diff) | |
qapi: Fix errors for non-string, non-dictionary members
Fixes the errors demonstrated by the previous commit.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/args-invalid.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-invalid.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.json | 1 |
6 files changed, 3 insertions, 6 deletions
diff --git a/tests/qapi-schema/args-invalid.err b/tests/qapi-schema/args-invalid.err index 6d0fa05c80..fe1e94975b 100644 --- a/tests/qapi-schema/args-invalid.err +++ b/tests/qapi-schema/args-invalid.err @@ -1 +1 @@ -tests/qapi-schema/args-invalid.json:2: 'data' for command 'foo' should be a dictionary +tests/qapi-schema/args-invalid.json:1: 'data' for command 'foo' should be a dictionary or type name diff --git a/tests/qapi-schema/args-invalid.json b/tests/qapi-schema/args-invalid.json index 4a641350e3..db0981341b 100644 --- a/tests/qapi-schema/args-invalid.json +++ b/tests/qapi-schema/args-invalid.json @@ -1,3 +1,2 @@ -# FIXME error "should be a dictionary" is misleading, type name is also fine { 'command': 'foo', 'data': false } diff --git a/tests/qapi-schema/struct-data-invalid.err b/tests/qapi-schema/struct-data-invalid.err index a40e23aaea..6644f4c2ad 100644 --- a/tests/qapi-schema/struct-data-invalid.err +++ b/tests/qapi-schema/struct-data-invalid.err @@ -1 +1 @@ -tests/qapi-schema/struct-data-invalid.json:2: 'data' for struct 'foo' should be a dictionary +tests/qapi-schema/struct-data-invalid.json:1: 'data' for struct 'foo' should be a dictionary or type name diff --git a/tests/qapi-schema/struct-data-invalid.json b/tests/qapi-schema/struct-data-invalid.json index b76de82552..9adbc3bb6b 100644 --- a/tests/qapi-schema/struct-data-invalid.json +++ b/tests/qapi-schema/struct-data-invalid.json @@ -1,3 +1,2 @@ -# FIXME error "should be a dictionary" is misleading, type name is also fine { 'struct': 'foo', 'data': false } diff --git a/tests/qapi-schema/struct-member-invalid.err b/tests/qapi-schema/struct-member-invalid.err index 9e4c7b85ff..69a326d450 100644 --- a/tests/qapi-schema/struct-member-invalid.err +++ b/tests/qapi-schema/struct-member-invalid.err @@ -1 +1 @@ -tests/qapi-schema/struct-member-invalid.json:2: Member 'a' of 'data' for struct 'foo' should be a dictionary +tests/qapi-schema/struct-member-invalid.json:1: Member 'a' of 'data' for struct 'foo' should be a type name diff --git a/tests/qapi-schema/struct-member-invalid.json b/tests/qapi-schema/struct-member-invalid.json index 968e63cb8e..8f172f7a87 100644 --- a/tests/qapi-schema/struct-member-invalid.json +++ b/tests/qapi-schema/struct-member-invalid.json @@ -1,3 +1,2 @@ -# FIXME error message "should be a dictionary" is wrong, must be type name { 'struct': 'foo', 'data': { 'a': false } } |