Re: [PATCH 02/28] tests/qapi-schema: Drop redundant flat-union-inline test

[John Snow]

On 3/23/21 5:39 AM, Markus Armbruster wrote:
> flat-union-inline.json covers longhand branch definition with an
> invalid type value.  It's redundant: longhand branch definition is
> covered by flat-union-inline-invalid-dict.json, and invalid type value
> is covered by nested-struct-data.json.  Drop the test.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

If you feel it's redundant, I trust your judge?ment here.

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>   tests/qapi-schema/flat-union-inline.err  |  2 --
>   tests/qapi-schema/flat-union-inline.json | 11 -----------
>   tests/qapi-schema/flat-union-inline.out  |  0
>   tests/qapi-schema/meson.build            |  1 -
>   4 files changed, 14 deletions(-)
>   delete mode 100644 tests/qapi-schema/flat-union-inline.err
>   delete mode 100644 tests/qapi-schema/flat-union-inline.json
>   delete mode 100644 tests/qapi-schema/flat-union-inline.out
>
> diff --git a/tests/qapi-schema/flat-union-inline.err 
> b/tests/qapi-schema/flat-union-inline.err
> deleted file mode 100644
> index 538283f5db..0000000000
> --- a/tests/qapi-schema/flat-union-inline.err
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -flat-union-inline.json: In union 'TestUnion':
> -flat-union-inline.json:7: 'data' member 'value1' should be a type name
> diff --git a/tests/qapi-schema/flat-union-inline.json 
> b/tests/qapi-schema/flat-union-inline.json
> deleted file mode 100644
> index a9b3ce3f0d..0000000000
> --- a/tests/qapi-schema/flat-union-inline.json
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -# we require branches to be a struct name
> -# TODO: should we allow anonymous inline branch types?
> -{ 'enum': 'TestEnum',
> -  'data': [ 'value1', 'value2' ] }
> -{ 'struct': 'Base',
> -  'data': { 'enum1': 'TestEnum', 'kind': 'str' } }
> -{ 'union': 'TestUnion',
> -  'base': 'Base',
> -  'discriminator': 'enum1',
> -  'data': { 'value1': { 'type': {} },
> -            'value2': { 'integer': 'int' } } }
> diff --git a/tests/qapi-schema/flat-union-inline.out 
> b/tests/qapi-schema/flat-union-inline.out
> deleted file mode 100644
> index e69de29bb2..0000000000
> diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
> index 304ef939bd..d5fa035507 100644
> --- a/tests/qapi-schema/meson.build
> +++ b/tests/qapi-schema/meson.build
> @@ -111,7 +111,6 @@ schemas = [
>     'flat-union-clash-member.json',
>     'flat-union-discriminator-bad-name.json',
>     'flat-union-empty.json',
> -  'flat-union-inline.json',
>     'flat-union-inline-invalid-dict.json',
>     'flat-union-int-branch.json',
>     'flat-union-invalid-branch-key.json',