diff options
| author | John Snow <jsnow@redhat.com> | 2021-05-19 14:39:46 -0400 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-05-20 11:28:28 +0200 |
| commit | c256263f3df0eaf9011405cdaee354380beb6dc5 (patch) | |
| tree | fa0a2f0ee34cac84f609bffe27ea26dc390f3e52 /tests | |
| parent | e0e8a0ac2e60fdebd7ff0f831250c849f22af35d (diff) | |
| download | qemu-c256263f3df0eaf9011405cdaee354380beb6dc5.zip qemu-c256263f3df0eaf9011405cdaee354380beb6dc5.tar.gz qemu-c256263f3df0eaf9011405cdaee354380beb6dc5.tar.bz2 | |
qapi/parser: Fix token membership tests when token can be None
When the token can be None (EOF), we can't use 'x in "abc"' style
membership tests to group types of tokens together, because 'None in
"abc"' is a TypeError.
Easy enough to fix. (Use a tuple: It's neither a static typing error nor
a runtime error to check for None in Tuple[str, ...])
Add tests to prevent a regression. (Note: they cannot be added prior to
this fix, as the unhandled stack trace will not match test output in the
CI system.)
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210519183951.3946870-11-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/meson.build | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-array-rsqb.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-array-rsqb.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-array-rsqb.out | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-object-member-element.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-object-member-element.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/missing-object-member-element.out | 0 |
7 files changed, 6 insertions, 0 deletions
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index dc448e8..9e8f658 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -134,9 +134,11 @@ schemas = [ 'indented-expr.json', 'leading-comma-list.json', 'leading-comma-object.json', + 'missing-array-rsqb.json', 'missing-colon.json', 'missing-comma-list.json', 'missing-comma-object.json', + 'missing-object-member-element.json', 'missing-type.json', 'nested-struct-data.json', 'nested-struct-data-invalid-dict.json', diff --git a/tests/qapi-schema/missing-array-rsqb.err b/tests/qapi-schema/missing-array-rsqb.err new file mode 100644 index 0000000..b5f58b8 --- /dev/null +++ b/tests/qapi-schema/missing-array-rsqb.err @@ -0,0 +1 @@ +missing-array-rsqb.json:1:44: expected '{', '[', string, or boolean diff --git a/tests/qapi-schema/missing-array-rsqb.json b/tests/qapi-schema/missing-array-rsqb.json new file mode 100644 index 0000000..7fca1df --- /dev/null +++ b/tests/qapi-schema/missing-array-rsqb.json @@ -0,0 +1 @@ +['Daisy,', 'Daisy,', 'Give me your answer', diff --git a/tests/qapi-schema/missing-array-rsqb.out b/tests/qapi-schema/missing-array-rsqb.out new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/qapi-schema/missing-array-rsqb.out diff --git a/tests/qapi-schema/missing-object-member-element.err b/tests/qapi-schema/missing-object-member-element.err new file mode 100644 index 0000000..c08a3dc --- /dev/null +++ b/tests/qapi-schema/missing-object-member-element.err @@ -0,0 +1 @@ +missing-object-member-element.json:1:8: expected '{', '[', string, or boolean diff --git a/tests/qapi-schema/missing-object-member-element.json b/tests/qapi-schema/missing-object-member-element.json new file mode 100644 index 0000000..f52d010 --- /dev/null +++ b/tests/qapi-schema/missing-object-member-element.json @@ -0,0 +1 @@ +{'key': diff --git a/tests/qapi-schema/missing-object-member-element.out b/tests/qapi-schema/missing-object-member-element.out new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/qapi-schema/missing-object-member-element.out |