summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarkus Armbruster2017-03-15 13:56:58 +0100
committerMarkus Armbruster2017-03-16 07:13:02 +0100
commit481537451302fc63eee5cf3663a92629bb78954f (patch)
tree29cfcab01ca3552013ba6d32efd21070bb0765ed /tests
parenttests/qapi-schema: Cover empty union base (diff)
downloadqemu-481537451302fc63eee5cf3663a92629bb78954f.tar.gz
qemu-481537451302fc63eee5cf3663a92629bb78954f.tar.xz
qemu-481537451302fc63eee5cf3663a92629bb78954f.zip
qapi: Fix to reject empty union base gracefully
Common Python pitfall: 'assert base_members' fires on [] in addition to None. Correct to 'assert base_members is not None'. 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-10-git-send-email-armbru@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qapi-schema/union-base-empty.err11
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/qapi-schema/union-base-empty.err b/tests/qapi-schema/union-base-empty.err
index 26bfa07bc9..7695806d81 100644
--- a/tests/qapi-schema/union-base-empty.err
+++ b/tests/qapi-schema/union-base-empty.err
@@ -1,10 +1 @@
-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
+tests/qapi-schema/union-base-empty.json:5: Discriminator 'type' is not a member of base struct 'Empty'