[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9 09/47] qapi: Fix to reject empty union base
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-2.9 09/47] qapi: Fix to reject empty union base gracefully |
Date: |
Mon, 13 Mar 2017 07:18:09 +0100 |
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 <address@hidden>
---
scripts/qapi.py | 2 +-
tests/qapi-schema/union-base-empty.err | 11 +----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index e98fd0c..eec7bfb 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -731,7 +731,7 @@ def check_union(expr, info):
raise QAPISemError(info, "Flat union '%s' must have a base"
% name)
base_members = find_base_members(base)
- assert base_members
+ assert base_members is not None
# The value of member 'discriminator' must name a non-optional
# member of the base struct.
diff --git a/tests/qapi-schema/union-base-empty.err
b/tests/qapi-schema/union-base-empty.err
index 61e6ec6..7695806 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 1483, in __init__
- self.exprs = check_exprs(parser.exprs)
- File "scripts/qapi.py", line 917, in check_exprs
- check_union(expr, info)
- File "scripts/qapi.py", line 734, 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'
--
2.7.4
- [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 08/47] tests/qapi-schema: Cover empty union base, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 04/47] docs/qapi-code-gen.txt: Drop confusing reference to 'gen', Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 02/47] qapi: Make doc comments optional where we don't need them, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 09/47] qapi: Fix to reject empty union base gracefully,
Markus Armbruster <=
- [Qemu-devel] [PATCH for-2.9 01/47] qapi: Factor QAPISchemaParser._include() out of .__init__(), Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 10/47] qapi2texi: Fix up output around #optional, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 13/47] qapi: Fix QAPISchemaEnumType.is_implicit() for 'QType', Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 06/47] qapi: Have each QAPI schema declare its name rule violations, Markus Armbruster, 2017/03/13