提交 10689e36 编写于 作者: M Markus Armbruster

tests/qapi-schema: Cover non-string, non-dictionary members

We always report "should be a dictionary" then.  This is misleading:
when allow_dict, it can be a dictionary or a type name string, else it
can only be a type name.
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
上级 91f9816d
...@@ -229,12 +229,14 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \ ...@@ -229,12 +229,14 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
redefined-type.json redefined-command.json redefined-builtin.json \ redefined-type.json redefined-command.json redefined-builtin.json \
redefined-event.json command-int.json bad-data.json event-max.json \ redefined-event.json command-int.json bad-data.json event-max.json \
type-bypass.json type-bypass-no-gen.json type-bypass-bad-gen.json \ type-bypass.json type-bypass-no-gen.json type-bypass-bad-gen.json \
args-invalid.json \
args-array-empty.json args-array-unknown.json args-int.json \ args-array-empty.json args-array-unknown.json args-int.json \
args-unknown.json args-member-unknown.json args-member-array.json \ args-unknown.json args-member-unknown.json args-member-array.json \
args-member-array-bad.json args-alternate.json args-union.json \ args-member-array-bad.json args-alternate.json args-union.json \
returns-array-bad.json returns-int.json returns-dict.json \ returns-array-bad.json returns-int.json returns-dict.json \
returns-unknown.json returns-alternate.json returns-whitelist.json \ returns-unknown.json returns-alternate.json returns-whitelist.json \
missing-colon.json missing-comma-list.json missing-comma-object.json \ missing-colon.json missing-comma-list.json missing-comma-object.json \
struct-data-invalid.json struct-member-invalid.json \
nested-struct-data.json non-objects.json \ nested-struct-data.json non-objects.json \
qapi-schema-test.json quoted-structural-chars.json \ qapi-schema-test.json quoted-structural-chars.json \
leading-comma-list.json leading-comma-object.json \ leading-comma-list.json leading-comma-object.json \
......
tests/qapi-schema/args-invalid.json:2: 'data' for command 'foo' should be a dictionary
# FIXME error "should be a dictionary" is misleading, type name is also fine
{ 'command': 'foo',
'data': false }
tests/qapi-schema/struct-data-invalid.json:2: 'data' for struct 'foo' should be a dictionary
# FIXME error "should be a dictionary" is misleading, type name is also fine
{ 'struct': 'foo',
'data': false }
tests/qapi-schema/struct-member-invalid.json:2: Member 'a' of 'data' for struct 'foo' should be a dictionary
# FIXME error message "should be a dictionary" is wrong, must be type name
{ 'struct': 'foo',
'data': { 'a': false } }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册