| Message ID | 20210930205716.1148693-4-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: static typing conversion, pt5b | expand |
John Snow <jsnow@redhat.com> writes: > Pylint informs us we're not using these arguments. Oops, it's > right. Correct the error message and remove the remaining unused > parameter. > > Fix test output now that the error message is improved. > Fixes: e151941d1b > > Signed-off-by: John Snow <jsnow@redhat.com> In v3, the blank line was where it belongs: Fix test output now that the error message is improved. Fixes: e151941d1b Signed-off-by: John Snow <jsnow@redhat.com> The change looks accidental. Can tidy up in my tree.
On Fri, Oct 1, 2021 at 10:11 AM Markus Armbruster <armbru@redhat.com> wrote: > John Snow <jsnow@redhat.com> writes: > > > Pylint informs us we're not using these arguments. Oops, it's > > right. Correct the error message and remove the remaining unused > > parameter. > > > > Fix test output now that the error message is improved. > > Fixes: e151941d1b > > > > Signed-off-by: John Snow <jsnow@redhat.com> > > In v3, the blank line was where it belongs: > > Fix test output now that the error message is improved. > > Fixes: e151941d1b > Signed-off-by: John Snow <jsnow@redhat.com> > > The change looks accidental. Can tidy up in my tree. > Yes please, thank you :)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index f03ba2cfec8..bfd2dbfd9a2 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -753,16 +753,18 @@ def check_expr(self, expr): def check(self): - def check_args_section(args, info, what): + def check_args_section(args, what): bogus = [name for name, section in args.items() if not section.member] if bogus: raise QAPISemError( self.info, - "documented member%s '%s' %s not exist" - % ("s" if len(bogus) > 1 else "", - "', '".join(bogus), - "do" if len(bogus) > 1 else "does")) + "documented %s%s '%s' %s not exist" % ( + what, + "s" if len(bogus) > 1 else "", + "', '".join(bogus), + "do" if len(bogus) > 1 else "does" + )) - check_args_section(self.args, self.info, 'members') - check_args_section(self.features, self.info, 'features') + check_args_section(self.args, 'member') + check_args_section(self.features, 'feature') diff --git a/tests/qapi-schema/doc-bad-feature.err b/tests/qapi-schema/doc-bad-feature.err index e4c62adfa3e..49d1746c3d1 100644 --- a/tests/qapi-schema/doc-bad-feature.err +++ b/tests/qapi-schema/doc-bad-feature.err @@ -1 +1 @@ -doc-bad-feature.json:3: documented member 'a' does not exist +doc-bad-feature.json:3: documented feature 'a' does not exist
Pylint informs us we're not using these arguments. Oops, it's right. Correct the error message and remove the remaining unused parameter. Fix test output now that the error message is improved. Fixes: e151941d1b Signed-off-by: John Snow <jsnow@redhat.com> --- scripts/qapi/parser.py | 16 +++++++++------- tests/qapi-schema/doc-bad-feature.err | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-)