[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/20] qapi: Improve 'include' error message
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 05/20] qapi: Improve 'include' error message |
Date: |
Fri, 9 Oct 2015 17:14:06 +0200 |
From: Eric Blake <address@hidden>
Use of '"...%s" % include' to print non-strings can lead to
ugly messages, such as this (if the .json change is applied
without the qapi.py change):
Expected a file name (string), got: OrderedDict()
Better is to just omit the actual non-string value in the
message.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi.py | 3 +--
tests/qapi-schema/include-non-file.err | 2 +-
tests/qapi-schema/include-non-file.json | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 06478bb..362e007 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -132,8 +132,7 @@ class QAPISchemaParser(object):
include = expr["include"]
if not isinstance(include, str):
raise QAPIExprError(expr_info,
- 'Expected a file name (string), got:
%s'
- % include)
+ "Value of 'include' must be a string")
incl_abs_fname = os.path.join(os.path.dirname(abs_fname),
include)
# catch inclusion cycle
diff --git a/tests/qapi-schema/include-non-file.err
b/tests/qapi-schema/include-non-file.err
index 9658c78..faae1ea 100644
--- a/tests/qapi-schema/include-non-file.err
+++ b/tests/qapi-schema/include-non-file.err
@@ -1 +1 @@
-tests/qapi-schema/include-non-file.json:1: Expected a file name (string), got:
['foo', 'bar']
+tests/qapi-schema/include-non-file.json:1: Value of 'include' must be a string
diff --git a/tests/qapi-schema/include-non-file.json
b/tests/qapi-schema/include-non-file.json
index cd43c3f..4711aa4 100644
--- a/tests/qapi-schema/include-non-file.json
+++ b/tests/qapi-schema/include-non-file.json
@@ -1 +1 @@
-{ 'include': [ 'foo', 'bar' ] }
+{ 'include': {} }
--
2.4.3
- [Qemu-devel] [PULL 15/20] qapi: Consistent generated code: prefer common labels, (continued)
- [Qemu-devel] [PULL 15/20] qapi: Consistent generated code: prefer common labels, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 12/20] qapi: Reuse code for flat union base validation, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 16/20] qapi: Consistent generated code: prefer common indentation, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 13/20] qapi: Consistent generated code: prefer error 'err', Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 09/20] qapi: Avoid assertion failure on union 'type' collision, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 14/20] qapi: Consistent generated code: prefer visitor 'v', Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 10/20] qapi: Add tests for empty unions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 08/20] qapi: Test for various name collisions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 18/20] qapi: Share gen_err_check(), Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 06/20] qapi: Invoke exception superclass initializer, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 05/20] qapi: Improve 'include' error message,
Markus Armbruster <=
- [Qemu-devel] [PULL 20/20] qapi: Simplify gen_visit_fields() error handling, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 02/20] MAINTAINERS: Specify QObject include and test files, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 03/20] MAINTAINERS: Specify QAPI include and test files, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 11/20] qapi: Test use of 'number' within alternates, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 19/20] qapi: Share gen_visit_fields(), Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 07/20] qapi: Clean up qapi.py per pep8, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 04/20] qapi: Sort qapi-schema tests, Markus Armbruster, 2015/10/10
- [Qemu-devel] [PULL 17/20] qapi: Consistent generated code: minimize push_indent() usage, Markus Armbruster, 2015/10/10
- Re: [Qemu-devel] [PULL 00/20] QAPI patches, Peter Maydell, 2015/10/12