From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgzJH-0002FE-46 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 14:07:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgzJC-0004Uy-68 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 14:07:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgzJB-0004UU-UT for qemu-devel@nongnu.org; Tue, 29 Sep 2015 14:07:22 -0400 References: <1443497249-15361-1-git-send-email-eblake@redhat.com> <1443497249-15361-9-git-send-email-eblake@redhat.com> <87k2r9ibw9.fsf@blackfin.pond.sub.org> From: Eric Blake Message-ID: <560AD353.5080802@redhat.com> Date: Tue, 29 Sep 2015 12:07:15 -0600 MIME-Version: 1.0 In-Reply-To: <87k2r9ibw9.fsf@blackfin.pond.sub.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HF7vRLGPRq8xMcgjaRNRFalh9mPq7pVgo" Subject: Re: [Qemu-devel] [PATCH v6 08/16] qapi: Test use of 'number' within alternates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: marcandre.lureau@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com, Michael Roth This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HF7vRLGPRq8xMcgjaRNRFalh9mPq7pVgo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 09/29/2015 07:38 AM, Markus Armbruster wrote: > Eric Blake writes: >=20 >> Add some testsuite exposure for use of a 'number' as part of >> an alternate. The current state of the tree has a few bugs >> exposed by this: our input parser depends on the ordering of >> how the qapi schema declared the alternate, and the parser >> does not accept integers for a 'number' in an alternate even >> though it does for numbers outside of an alternate. >> >> Mixing 'int' and 'number' in the same alternate is unusual, >> since both are supplied by json-numbers, but there does not >> seem to be a technical reason to forbid it given that our >> json lexer distinguishes between json-numbers that can be >> represented as an int vs. those that cannot. >> >> Improve the existing test_visitor_in_alternate() to match the >> style of the new test_visitor_in_alternate_number(), and to >> ensure full coverage of all possible qtype parsing. >> >> Signed-off-by: Eric Blake >> +++ b/tests/test-qmp-input-visitor.c >> @@ -371,12 +371,133 @@ static void test_visitor_in_alternate(TestInput= VisitorData *data, >> UserDefAlternate *tmp; >> >> v =3D visitor_input_test_init(data, "42"); >> - >> - visit_type_UserDefAlternate(v, &tmp, NULL, &err); >> - g_assert(err =3D=3D NULL); >> + visit_type_UserDefAlternate(v, &tmp, NULL, &error_abort); >> g_assert_cmpint(tmp->kind, =3D=3D, USER_DEF_ALTERNATE_KIND_I); >> g_assert_cmpint(tmp->i, =3D=3D, 42); >> qapi_free_UserDefAlternate(tmp); >> + visitor_input_teardown(data, NULL); >=20 > Ugly in this test: visitor_input_test_init() is to be paired with > visitor_input_teardown(), but each test's last visitor_input_teardown()= > can be omitted, because we also pass visitor_input_teardown to > g_test_add(). Not your patch's fault. Let's ignore it for now. v5 25/46 claims otherwise (valgrind was complaining about leaks that additional calls to visitor_input_teardown() resolved; maybe the test engine is not automatically doing the expected teardown?). And maybe it would be smarter to rework the tests to allow reusing an existing visitor on a new string, instead of completely allocating a new visitor framework for every new string to parse. But indeed, any further cleanups are better done in that later patch. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --HF7vRLGPRq8xMcgjaRNRFalh9mPq7pVgo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJWCtNTAAoJEKeha0olJ0NqB3MH/3R/isQLHlBmQlzYOGabRpEc ux2Qh8hdLdyz+urR0rkCs7yHo1gR0xahWuth2H/MN0AJ7hf0OU7tbRgg8DOYULYi AVRP2UvAteDdQqz4mmLhGcvuH59J9Oh77QzX2lmTPg8CIo37X8XmJpR6tl9sfcci zEw/4X6jPaFLlUbK7BXf0SvI1N5s+m03qTlkFW2HndH8bYsgndtfbO+5W0yWQwU0 7H/LVzf+7ddnjhMafAmCQmF+oshdYiwiXixuV3Mp3gOKVBYKEMQapqkUAF91e/5R qqVzGg0ihiMFOPZEkxPQsc4nHNw+te0h8nqRgXguAcTFyqkO9t4/UYx3Zx3imbY= =iuSn -----END PGP SIGNATURE----- --HF7vRLGPRq8xMcgjaRNRFalh9mPq7pVgo--