[{"id":1817046,"web_url":"http://patchwork.ozlabs.org/comment/1817046/","msgid":"<87lgifx1bg.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-12-06T16:34:27","subject":"Re: [Qemu-devel] [PATCH v3 05/50] qapi: add tests for invalid 'if'","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\nThis tests error conditions added in the previous commit. I recommend\nsquashing the two together.\n\n> ---\n> tests/Makefile.include | 3 +++\n> tests/qapi-schema/bad-if-empty-list.err | 1 +\n> tests/qapi-schema/bad-if-empty-list.exit | 1 +\n> tests/qapi-schema/bad-if-empty-list.json | 3 +++\n> tests/qapi-schema/bad-if-empty-list.out | 0\n> tests/qapi-schema/bad-if-empty.err | 1 +\n> tests/qapi-schema/bad-if-empty.exit | 1 +\n> tests/qapi-schema/bad-if-empty.json | 3 +++\n> tests/qapi-schema/bad-if-empty.out | 0\n> tests/qapi-schema/bad-if.err | 1 +\n> tests/qapi-schema/bad-if.exit | 1 +\n> tests/qapi-schema/bad-if.json | 3 +++\n> tests/qapi-schema/bad-if.out | 0\n> 13 files changed, 18 insertions(+)\n> create mode 100644 tests/qapi-schema/bad-if-empty-list.err\n> create mode 100644 tests/qapi-schema/bad-if-empty-list.exit\n> create mode 100644 tests/qapi-schema/bad-if-empty-list.json\n> create mode 100644 tests/qapi-schema/bad-if-empty-list.out\n> create mode 100644 tests/qapi-schema/bad-if-empty.err\n> create mode 100644 tests/qapi-schema/bad-if-empty.exit\n> create mode 100644 tests/qapi-schema/bad-if-empty.json\n> create mode 100644 tests/qapi-schema/bad-if-empty.out\n> create mode 100644 tests/qapi-schema/bad-if.err\n> create mode 100644 tests/qapi-schema/bad-if.exit\n> create mode 100644 tests/qapi-schema/bad-if.json\n> create mode 100644 tests/qapi-schema/bad-if.out\n>\n> diff --git a/tests/Makefile.include b/tests/Makefile.include\n> index fae5715e9c..8dac7c9083 100644\n> --- a/tests/Makefile.include\n> +++ b/tests/Makefile.include\n> @@ -402,6 +402,9 @@ qapi-schema += args-unknown.json\n> qapi-schema += bad-base.json\n> qapi-schema += bad-data.json\n> qapi-schema += bad-ident.json\n> +qapi-schema += bad-if.json\n> +qapi-schema += bad-if-empty.json\n> +qapi-schema += bad-if-empty-list.json\n> qapi-schema += bad-type-bool.json\n> qapi-schema += bad-type-dict.json\n> qapi-schema += bad-type-int.json\n> diff --git a/tests/qapi-schema/bad-if-empty-list.err b/tests/qapi-schema/bad-if-empty-list.err\n> new file mode 100644\n> index 0000000000..75fe6497bc\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if-empty-list.err\n> @@ -0,0 +1 @@\n> +tests/qapi-schema/bad-if-empty-list.json:2: 'if' condition [] is useless\n> diff --git a/tests/qapi-schema/bad-if-empty-list.exit b/tests/qapi-schema/bad-if-empty-list.exit\n> new file mode 100644\n> index 0000000000..d00491fd7e\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if-empty-list.exit\n> @@ -0,0 +1 @@\n> +1\n> diff --git a/tests/qapi-schema/bad-if-empty-list.json b/tests/qapi-schema/bad-if-empty-list.json\n> new file mode 100644\n> index 0000000000..94f2eb8670\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if-empty-list.json\n> @@ -0,0 +1,3 @@\n> +# check empty 'if' list\n> +{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n> + 'if': [] }\n> diff --git a/tests/qapi-schema/bad-if-empty-list.out b/tests/qapi-schema/bad-if-empty-list.out\n> new file mode 100644\n> index 0000000000..e69de29bb2\n\nThis covers \"'if' condition [] is useless\".\n\n> diff --git a/tests/qapi-schema/bad-if-empty.err b/tests/qapi-schema/bad-if-empty.err\n> new file mode 100644\n> index 0000000000..358bdc3e51\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if-empty.err\n> @@ -0,0 +1 @@\n> +tests/qapi-schema/bad-if-empty.json:2: 'if' condition '' makes no sense\n> diff --git a/tests/qapi-schema/bad-if-empty.exit b/tests/qapi-schema/bad-if-empty.exit\n> new file mode 100644\n> index 0000000000..d00491fd7e\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if-empty.exit\n> @@ -0,0 +1 @@\n> +1\n> diff --git a/tests/qapi-schema/bad-if-empty.json b/tests/qapi-schema/bad-if-empty.json\n> new file mode 100644\n> index 0000000000..fe1dd4eca6\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if-empty.json\n> @@ -0,0 +1,3 @@\n> +# check empty 'if'\n> +{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n> + 'if': '' }\n> diff --git a/tests/qapi-schema/bad-if-empty.out b/tests/qapi-schema/bad-if-empty.out\n> new file mode 100644\n> index 0000000000..e69de29bb2\n\nThis covers \"'if' condition '' makes no sense\", not wrapped in a list.\n\n> diff --git a/tests/qapi-schema/bad-if.err b/tests/qapi-schema/bad-if.err\n> new file mode 100644\n> index 0000000000..c2e3f5f44c\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if.err\n> @@ -0,0 +1 @@\n> +tests/qapi-schema/bad-if.json:2: 'if' condition must be a string or a list of strings\n> diff --git a/tests/qapi-schema/bad-if.exit b/tests/qapi-schema/bad-if.exit\n> new file mode 100644\n> index 0000000000..d00491fd7e\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if.exit\n> @@ -0,0 +1 @@\n> +1\n> diff --git a/tests/qapi-schema/bad-if.json b/tests/qapi-schema/bad-if.json\n> new file mode 100644\n> index 0000000000..3edd1a0bf2\n> --- /dev/null\n> +++ b/tests/qapi-schema/bad-if.json\n> @@ -0,0 +1,3 @@\n> +# check invalid 'if' type\n> +{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n> + 'if': { 'value': 'defined(TEST_IF_STRUCT)' } }\n> diff --git a/tests/qapi-schema/bad-if.out b/tests/qapi-schema/bad-if.out\n> new file mode 100644\n> index 0000000000..e69de29bb2\n\nThis covers \"'if' condition must be a string or a list of strings\", not\nwrapped in a list.\n\nNot covered: the two not wrapped in a list cases wrapped in a list.\nHowever, I figure this is good enough as is, thus\nReviewed-by: Markus Armbruster ","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 3ysPNp6fJpz9sNr\n\tfor ;\n\tThu, 7 Dec 2017 03:35:21 +1100 (AEDT)","from localhost ([::1]:56471 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eMcfG-0004Th-Nk\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Dec 2017 11:35:18 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:48787)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1eMceb-0004QH-Iv\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 11:34:39 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1eMceY-0000gL-Uq\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 11:34:37 -0500","from mx1.redhat.com ([209.132.183.28]:34626)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1eMceY-0000db-Mm\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 11:34:34 -0500","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 E35B46A7D5;\n\tWed, 6 Dec 2017 16:34:32 +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 B45087841B;\n\tWed, 6 Dec 2017 16:34:28 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 46EE91138658; Wed, 6 Dec 2017 17:34:27 +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-6-marcandre.lureau@redhat.com>","Date":"Wed, 06 Dec 2017 17:34:27 +0100","In-Reply-To":"<20170911110623.24981-6-marcandre.lureau@redhat.com> (\n\t=?utf-8?b?Ik1hcmMtQW5kcsOp?= Lureau\"'s message of \"Mon,\n\t11 Sep 2017 13:05:38 +0200\")","Message-ID":"<87lgifx1bg.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.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 06 Dec 2017 16:34:33 +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 05/50] qapi: add tests for invalid 'if'","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"}}]