Marc-André Lureau <marcandre.lur...@redhat.com> writes:
> Modify the test visitor to check correct passing of values.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> Reviewed-by: Markus Armbruster <arm...@redhat.com>
> ---
[...]
> diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
> index 10e68b01d9..6d25a37dda 100644
> --- a/tests/qapi-schema/test-qapi.py
> +++ b/tests/qapi-schema/test-qapi.py
> @@ -23,12 +23,13 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
> def visit_include(self, name, info):
> print('include %s' % name)
>
> - def visit_enum_type(self, name, info, values, prefix):
> + def visit_enum_type(self, name, info, ifcond, values, prefix):
> print('enum %s %s' % (name, values))
> if prefix:
> print(' prefix %s' % prefix)
> + self._print_if(ifcond)
>
> - def visit_object_type(self, name, info, base, members, variants):
> + def visit_object_type(self, name, info, ifcond, base, members, variants):
> print('object %s' % name)
> if base:
> print(' base %s' % base.name)
> @@ -36,21 +37,25 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
> print(' member %s: %s optional=%s' % \
> (m.name, m.type.name, m.optional))
> self._print_variants(variants)
> + self._print_if(ifcond)
>
> - def visit_alternate_type(self, name, info, variants):
> + def visit_alternate_type(self, name, info, ifcond, variants):
> print('alternate %s' % name)
> self._print_variants(variants)
> + self._print_if(ifcond)
>
> - def visit_command(self, name, info, arg_type, ret_type,
> + def visit_command(self, name, info, ifcond, arg_type, ret_type,
> gen, success_response, boxed, allow_oob):
> print('command %s %s -> %s' % \
> (name, arg_type and arg_type.name, ret_type and ret_type.name))
> print(' gen=%s success_response=%s boxed=%s' % \
> (gen, success_response, boxed))
> + self._print_if(ifcond)
>
> - def visit_event(self, name, info, arg_type, boxed):
> + def visit_event(self, name, info, ifcond, arg_type, boxed):
> print('event %s %s' % (name, arg_type and arg_type.name))
> print(' boxed=%s' % boxed)
> + self._print_if(ifcond)
>
> @staticmethod
> def _print_variants(variants):
> @@ -59,6 +64,10 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
> for v in variants.variants:
> print(' case %s: %s' % (v.name, v.type.name))
>
> + @staticmethod
> + def _print_if(ifcond, indent=4):
> + if ifcond:
> + print('%sif %s' % (' ' * indent, ifcond))
>
pycodestyle points out:
tests/qapi-schema/test-qapi.py:72:1: E305 expected 2 blank lines after
class or function definition, found 1
Can touch up when I apply.
> try:
> schema = QAPISchema(sys.argv[1])
