diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-03-15 13:56:57 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-03-16 07:13:02 +0100 |
| commit | 707fb2d381de7a03e5bf9d2bd305dc7883fd992e (patch) | |
| tree | dec7a1463f4fe3568f61f9ab95fb7dcb3fb0f4c5 /tests | |
| parent | bd7f974796872fc754c2d01b3a8499e8bb85f844 (diff) | |
tests/qapi-schema: Cover empty union base
The new test case shows off qapi.py choking on an empty union base.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1489582656-31133-9-git-send-email-armbru@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/union-base-empty.err | 10 | ||||
| -rw-r--r-- | tests/qapi-schema/union-base-empty.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/union-base-empty.json | 9 | ||||
| -rw-r--r-- | tests/qapi-schema/union-base-empty.out | 0 |
5 files changed, 21 insertions, 0 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 16e0a9f615..3e640a846c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -476,6 +476,7 @@ qapi-schema += unclosed-list.json qapi-schema += unclosed-object.json qapi-schema += unclosed-string.json qapi-schema += unicode-str.json +qapi-schema += union-base-empty.json qapi-schema += union-base-no-discriminator.json qapi-schema += union-branch-case.json qapi-schema += union-clash-branches.json diff --git a/tests/qapi-schema/union-base-empty.err b/tests/qapi-schema/union-base-empty.err new file mode 100644 index 0000000000..26bfa07bc9 --- /dev/null +++ b/tests/qapi-schema/union-base-empty.err @@ -0,0 +1,10 @@ +Traceback (most recent call last): + File "tests/qapi-schema/test-qapi.py", line 56, in <module> + schema = QAPISchema(sys.argv[1]) + File "scripts/qapi.py", line 1487, in __init__ + self.exprs = check_exprs(parser.exprs) + File "scripts/qapi.py", line 921, in check_exprs + check_union(expr, info) + File "scripts/qapi.py", line 738, in check_union + assert base_members +AssertionError diff --git a/tests/qapi-schema/union-base-empty.exit b/tests/qapi-schema/union-base-empty.exit new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/qapi-schema/union-base-empty.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/union-base-empty.json b/tests/qapi-schema/union-base-empty.json new file mode 100644 index 0000000000..d1843d33b4 --- /dev/null +++ b/tests/qapi-schema/union-base-empty.json @@ -0,0 +1,9 @@ +# Flat union with empty base and therefore without discriminator + +{ 'struct': 'Empty', 'data': { } } + +{ 'union': 'TestUnion', + 'base': 'Empty', + 'discriminator': 'type', + 'data': { 'value1': 'int', + 'value2': 'str' } } diff --git a/tests/qapi-schema/union-base-empty.out b/tests/qapi-schema/union-base-empty.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/qapi-schema/union-base-empty.out |