diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-08-31 17:17:42 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-09-04 15:47:16 +0200 |
| commit | 10689e36eb99e99751497ac8cef2a946e9a3a850 (patch) | |
| tree | a1fe458f07481ef6aabd3e2137eef38305c7fe79 /tests/qapi-schema | |
| parent | 91f9816da4d505d379753896f3f7b6abb910324b (diff) | |
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qapi-schema')
| -rw-r--r-- | tests/qapi-schema/args-invalid.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/args-invalid.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/args-invalid.json | 3 | ||||
| -rw-r--r-- | tests/qapi-schema/args-invalid.out | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.json | 3 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.out | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.json | 3 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.out | 0 |
12 files changed, 15 insertions, 0 deletions
diff --git a/tests/qapi-schema/args-invalid.err b/tests/qapi-schema/args-invalid.err new file mode 100644 index 0000000000..6d0fa05c80 --- /dev/null +++ b/tests/qapi-schema/args-invalid.err @@ -0,0 +1 @@ +tests/qapi-schema/args-invalid.json:2: 'data' for command 'foo' should be a dictionary diff --git a/tests/qapi-schema/args-invalid.exit b/tests/qapi-schema/args-invalid.exit new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/qapi-schema/args-invalid.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/args-invalid.json b/tests/qapi-schema/args-invalid.json new file mode 100644 index 0000000000..4a641350e3 --- /dev/null +++ b/tests/qapi-schema/args-invalid.json @@ -0,0 +1,3 @@ +# FIXME error "should be a dictionary" is misleading, type name is also fine +{ 'command': 'foo', + 'data': false } diff --git a/tests/qapi-schema/args-invalid.out b/tests/qapi-schema/args-invalid.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/qapi-schema/args-invalid.out diff --git a/tests/qapi-schema/struct-data-invalid.err b/tests/qapi-schema/struct-data-invalid.err new file mode 100644 index 0000000000..a40e23aaea --- /dev/null +++ b/tests/qapi-schema/struct-data-invalid.err @@ -0,0 +1 @@ +tests/qapi-schema/struct-data-invalid.json:2: 'data' for struct 'foo' should be a dictionary diff --git a/tests/qapi-schema/struct-data-invalid.exit b/tests/qapi-schema/struct-data-invalid.exit new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/qapi-schema/struct-data-invalid.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/struct-data-invalid.json b/tests/qapi-schema/struct-data-invalid.json new file mode 100644 index 0000000000..b76de82552 --- /dev/null +++ b/tests/qapi-schema/struct-data-invalid.json @@ -0,0 +1,3 @@ +# FIXME error "should be a dictionary" is misleading, type name is also fine +{ 'struct': 'foo', + 'data': false } diff --git a/tests/qapi-schema/struct-data-invalid.out b/tests/qapi-schema/struct-data-invalid.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/qapi-schema/struct-data-invalid.out diff --git a/tests/qapi-schema/struct-member-invalid.err b/tests/qapi-schema/struct-member-invalid.err new file mode 100644 index 0000000000..9e4c7b85ff --- /dev/null +++ b/tests/qapi-schema/struct-member-invalid.err @@ -0,0 +1 @@ +tests/qapi-schema/struct-member-invalid.json:2: Member 'a' of 'data' for struct 'foo' should be a dictionary diff --git a/tests/qapi-schema/struct-member-invalid.exit b/tests/qapi-schema/struct-member-invalid.exit new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/qapi-schema/struct-member-invalid.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/struct-member-invalid.json b/tests/qapi-schema/struct-member-invalid.json new file mode 100644 index 0000000000..968e63cb8e --- /dev/null +++ b/tests/qapi-schema/struct-member-invalid.json @@ -0,0 +1,3 @@ +# FIXME error message "should be a dictionary" is wrong, must be type name +{ 'struct': 'foo', + 'data': { 'a': false } } diff --git a/tests/qapi-schema/struct-member-invalid.out b/tests/qapi-schema/struct-member-invalid.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/qapi-schema/struct-member-invalid.out |