[{"id":1819006,"web_url":"http://patchwork.ozlabs.org/comment/1819006/","msgid":"<87tvx19k5q.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-12-08T17:58:09","subject":"Re: [Qemu-devel] [PATCH v3 22/50] tests: add some enum members tests","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/","name":"Markus Armbruster","email":"armbru@redhat.com"},"content":"Marc-André Lureau writes:\n\n> Signed-off-by: Marc-André Lureau \n> ---\n> tests/Makefile.include | 3 +++\n> tests/qapi-schema/enum-dict-member-invalid.err | 1 +\n> tests/qapi-schema/enum-dict-member-invalid.exit | 1 +\n> tests/qapi-schema/enum-dict-member-invalid.json | 2 ++\n> tests/qapi-schema/enum-dict-member-invalid.out | 0\n> tests/qapi-schema/enum-dict-member-invalid2.err | 1 +\n> tests/qapi-schema/enum-dict-member-invalid2.exit | 1 +\n> tests/qapi-schema/enum-dict-member-invalid2.json | 2 ++\n> tests/qapi-schema/enum-dict-member-invalid2.out | 0\n> tests/qapi-schema/enum-if-invalid.err | 1 +\n> tests/qapi-schema/enum-if-invalid.exit | 1 +\n> tests/qapi-schema/enum-if-invalid.json | 3 +++\n> tests/qapi-schema/enum-if-invalid.out | 0\n> 13 files changed, 16 insertions(+)\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid.err\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid.exit\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid.json\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid.out\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid2.err\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid2.exit\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid2.json\n> create mode 100644 tests/qapi-schema/enum-dict-member-invalid2.out\n> create mode 100644 tests/qapi-schema/enum-if-invalid.err\n> create mode 100644 tests/qapi-schema/enum-if-invalid.exit\n> create mode 100644 tests/qapi-schema/enum-if-invalid.json\n> create mode 100644 tests/qapi-schema/enum-if-invalid.out\n>\n> diff --git a/tests/Makefile.include b/tests/Makefile.include\n> index a9f0ddbe01..0aa532f029 100644\n> --- a/tests/Makefile.include\n> +++ b/tests/Makefile.include\n> @@ -443,6 +443,9 @@ qapi-schema += empty.json\n> qapi-schema += enum-bad-name.json\n> qapi-schema += enum-bad-prefix.json\n> qapi-schema += enum-clash-member.json\n> +qapi-schema += enum-dict-member-invalid.json\n> +qapi-schema += enum-dict-member-invalid2.json\n> +qapi-schema += enum-if-invalid.json\n> qapi-schema += enum-int-member.json\n> qapi-schema += enum-member-case.json\n> qapi-schema += enum-missing-data.json\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid.err b/tests/qapi-schema/enum-dict-member-invalid.err\n> new file mode 100644\n> index 0000000000..d12cca0df3\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-dict-member-invalid.err\n> @@ -0,0 +1 @@\n> +tests/qapi-schema/enum-dict-member-invalid.json:2: Dictionary member of enum 'MyEnum' must have a 'name' key\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid.exit b/tests/qapi-schema/enum-dict-member-invalid.exit\n> new file mode 100644\n> index 0000000000..d00491fd7e\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-dict-member-invalid.exit\n> @@ -0,0 +1 @@\n> +1\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid.json b/tests/qapi-schema/enum-dict-member-invalid.json\n> new file mode 100644\n> index 0000000000..9cf8406867\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-dict-member-invalid.json\n> @@ -0,0 +1,2 @@\n> +# we reject any enum member that is not a string or a dict with 'name'\n> +{ 'enum': 'MyEnum', 'data': [ { 'value': 'str' } ] }\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid.out b/tests/qapi-schema/enum-dict-member-invalid.out\n> new file mode 100644\n> index 0000000000..e69de29bb2\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid2.err b/tests/qapi-schema/enum-dict-member-invalid2.err\n> new file mode 100644\n> index 0000000000..f7dc1a2b33\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-dict-member-invalid2.err\n> @@ -0,0 +1 @@\n> +tests/qapi-schema/enum-dict-member-invalid2.json:2: Dictionnary has unknown keys: bad-key (allowed: name, if)\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid2.exit b/tests/qapi-schema/enum-dict-member-invalid2.exit\n> new file mode 100644\n> index 0000000000..d00491fd7e\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-dict-member-invalid2.exit\n> @@ -0,0 +1 @@\n> +1\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid2.json b/tests/qapi-schema/enum-dict-member-invalid2.json\n> new file mode 100644\n> index 0000000000..6664c59201\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-dict-member-invalid2.json\n> @@ -0,0 +1,2 @@\n> +# we reject any enum member that is not a string or a dict with 'name'\n> +{ 'enum': 'MyEnum', 'data': [ { 'name': 'foo', 'bad-key': 'str' } ] }\n> diff --git a/tests/qapi-schema/enum-dict-member-invalid2.out b/tests/qapi-schema/enum-dict-member-invalid2.out\n> new file mode 100644\n> index 0000000000..e69de29bb2\n> diff --git a/tests/qapi-schema/enum-if-invalid.err b/tests/qapi-schema/enum-if-invalid.err\n> new file mode 100644\n> index 0000000000..54c3cf887b\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-if-invalid.err\n> @@ -0,0 +1 @@\n> +tests/qapi-schema/enum-if-invalid.json:2: 'if' condition must be a string or a list of strings\n> diff --git a/tests/qapi-schema/enum-if-invalid.exit b/tests/qapi-schema/enum-if-invalid.exit\n> new file mode 100644\n> index 0000000000..d00491fd7e\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-if-invalid.exit\n> @@ -0,0 +1 @@\n> +1\n> diff --git a/tests/qapi-schema/enum-if-invalid.json b/tests/qapi-schema/enum-if-invalid.json\n> new file mode 100644\n> index 0000000000..60bd0ef1d7\n> --- /dev/null\n> +++ b/tests/qapi-schema/enum-if-invalid.json\n> @@ -0,0 +1,3 @@\n> +# check invalid 'if' type\n> +{ 'enum': 'TestIfEnum', 'data':\n> + [ 'foo', { 'name' : 'bar', 'if': { 'val': 'foo' } } ] }\n> diff --git a/tests/qapi-schema/enum-if-invalid.out b/tests/qapi-schema/enum-if-invalid.out\n> new file mode 100644\n> index 0000000000..e69de29bb2\n\nThese tests are related to the coverage gap I mentioned in my review of\nPATCH 19.\n\nI think it makes sense to add related new tests together, right when we\nadd whatever they test.","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3ytg820kSVz9s7B\n\tfor ;\n\tSat, 9 Dec 2017 04:58:41 +1100 (AEDT)","from localhost ([::1]:38448 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eNMv0-00042n-Qv\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Dec 2017 12:58:38 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:43744)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1eNMug-000426-LT\n\tfor qemu-devel@nongnu.org; Fri, 08 Dec 2017 12:58:19 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1eNMud-0006Mb-IH\n\tfor qemu-devel@nongnu.org; Fri, 08 Dec 2017 12:58:18 -0500","from mx1.redhat.com ([209.132.183.28]:44908)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1eNMud-0006MJ-8j\n\tfor qemu-devel@nongnu.org; Fri, 08 Dec 2017 12:58:15 -0500","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 4C44537B2A8;\n\tFri, 8 Dec 2017 17:58:14 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-74.ams2.redhat.com\n\t[10.36.116.74])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 2749677EB2;\n\tFri, 8 Dec 2017 17:58:11 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid A3F271138658; Fri, 8 Dec 2017 18:58:09 +0100 (CET)"],"From":"Markus Armbruster ","To":"=?utf-8?q?Marc-Andr=C3=A9?= Lureau ","References":"<20170911110623.24981-1-marcandre.lureau@redhat.com>\n\t<20170911110623.24981-23-marcandre.lureau@redhat.com>","Date":"Fri, 08 Dec 2017 18:58:09 +0100","In-Reply-To":"<20170911110623.24981-23-marcandre.lureau@redhat.com> (\n\t=?utf-8?b?Ik1hcmMtQW5kcsOp?= Lureau\"'s message of \"Mon,\n\t11 Sep 2017 \t13:05:55 +0200\")","Message-ID":"<87tvx19k5q.fsf@dusky.pond.sub.org>","User-Agent":"Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tFri, 08 Dec 2017 17:58:14 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v3 22/50] tests: add some enum members tests","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-devel@nongnu.org, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]