From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: michael.roth@amd.com, marcandre.lureau@redhat.com,
berrange@redhat.com, eblake@redhat.com, jsnow@redhat.com
Subject: [PATCH 09/14] tests/qapi-schema: Improve union discriminator coverage
Date: Thu, 16 Mar 2023 08:13:20 +0100 [thread overview]
Message-ID: <20230316071325.492471-10-armbru@redhat.com> (raw)
In-Reply-To: <20230316071325.492471-1-armbru@redhat.com>
A union's 'discriminator' must name a one of the common members.
QAPISchemaVariants.check() looks it up by its c_name(), then checks
the name matches exactly (because c_name() is not injective).
Tests union-base-empty and union-invalid-discriminator both cover the
case where lookup fails. Repurpose the latter to cover the case where
it succeeds and the name check fails.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/qapi-schema/union-invalid-discriminator.err | 2 +-
tests/qapi-schema/union-invalid-discriminator.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qapi-schema/union-invalid-discriminator.err b/tests/qapi-schema/union-invalid-discriminator.err
index 38efb24b98..6bd774c156 100644
--- a/tests/qapi-schema/union-invalid-discriminator.err
+++ b/tests/qapi-schema/union-invalid-discriminator.err
@@ -1,2 +1,2 @@
union-invalid-discriminator.json: In union 'TestUnion':
-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a member of 'base'
+union-invalid-discriminator.json:10: discriminator 'type_tag' is not a member of 'base'
diff --git a/tests/qapi-schema/union-invalid-discriminator.json b/tests/qapi-schema/union-invalid-discriminator.json
index c4fce97362..f315f36e37 100644
--- a/tests/qapi-schema/union-invalid-discriminator.json
+++ b/tests/qapi-schema/union-invalid-discriminator.json
@@ -8,7 +8,7 @@
'data': { 'integer': 'int' } }
{ 'union': 'TestUnion',
- 'base': { 'enum1': 'TestEnum' },
- 'discriminator': 'enum_wrong',
+ 'base': { 'type-tag': 'TestEnum' },
+ 'discriminator': 'type_tag',
'data': { 'value1': 'TestTypeA',
'value2': 'TestTypeB' } }
--
2.39.2
next prev parent reply other threads:[~2023-03-16 7:16 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 7:13 [PATCH 00/14] qapi: Fix minor bugs, require boxed for conditional arguments Markus Armbruster
2023-03-16 7:13 ` [PATCH 01/14] qapi: Fix error message format regression Markus Armbruster
2023-03-16 21:56 ` Eric Blake
2023-03-16 7:13 ` [PATCH 02/14] qapi/schema: Use super() Markus Armbruster
2023-03-16 7:40 ` Philippe Mathieu-Daudé
2023-03-16 7:13 ` [PATCH 03/14] qapi: Clean up after removal of simple unions Markus Armbruster
2023-03-17 0:38 ` Eric Blake
2023-03-16 7:13 ` [PATCH 04/14] qapi: Split up check_type() Markus Armbruster
2023-03-17 0:53 ` Eric Blake
2023-03-17 5:36 ` Markus Armbruster
2023-03-16 7:13 ` [PATCH 05/14] qapi: Improve error message for unexpected array types Markus Armbruster
2023-03-16 7:41 ` Philippe Mathieu-Daudé
2023-03-16 7:13 ` [PATCH 06/14] qapi: Simplify code a bit after previous commit Markus Armbruster
2023-03-17 0:55 ` Eric Blake
2023-03-17 5:42 ` Markus Armbruster
2023-03-16 7:13 ` [PATCH 07/14] qapi: Fix error message when type name or array is expected Markus Armbruster
2023-03-17 0:57 ` Eric Blake
2023-03-16 7:13 ` [PATCH 08/14] qapi: Fix to reject 'data': 'mumble' in struct Markus Armbruster
2023-03-17 1:02 ` Eric Blake
2023-03-17 5:48 ` Markus Armbruster
2023-03-16 7:13 ` Markus Armbruster [this message]
2023-03-17 1:06 ` [PATCH 09/14] tests/qapi-schema: Improve union discriminator coverage Eric Blake
2023-03-17 5:51 ` Markus Armbruster
2023-03-16 7:13 ` [PATCH 10/14] tests/qapi-schema: Rename a few conditionals Markus Armbruster
2023-03-16 7:45 ` Philippe Mathieu-Daudé
2023-03-16 7:13 ` [PATCH 11/14] tests/qapi-schema: Clean up positive test for conditionals Markus Armbruster
2023-03-17 1:09 ` Eric Blake
2023-03-17 6:10 ` Markus Armbruster
2023-03-17 12:29 ` Eric Blake
2023-03-17 14:14 ` Markus Armbruster
2023-03-16 7:13 ` [PATCH 12/14] tests/qapi-schema: Cover optional conditional struct member Markus Armbruster
2023-03-16 7:45 ` Philippe Mathieu-Daudé
2023-03-16 7:13 ` [PATCH 13/14] qapi: Fix code generated for " Markus Armbruster
2023-03-17 1:13 ` Eric Blake
2023-03-16 7:13 ` [PATCH 14/14] qapi: Require boxed for conditional command and event arguments Markus Armbruster
2023-03-17 1:17 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230316071325.492471-10-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).