From nobody Mon Feb 9 02:52:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 148958273601312.532980081300025; Wed, 15 Mar 2017 05:58:56 -0700 (PDT) Received: from localhost ([::1]:37010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co8Vv-0001X1-FY for importer@patchew.org; Wed, 15 Mar 2017 08:58:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co8Up-0001V7-Gs for qemu-devel@nongnu.org; Wed, 15 Mar 2017 08:57:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1co8Uo-0000H7-49 for qemu-devel@nongnu.org; Wed, 15 Mar 2017 08:57:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1co8Un-0000GQ-Sw for qemu-devel@nongnu.org; Wed, 15 Mar 2017 08:57:42 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C56D5F6246; Wed, 15 Mar 2017 12:57:41 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2FCvehX011886 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 15 Mar 2017 08:57:41 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 87AD011385E1; Wed, 15 Mar 2017 13:57:36 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C56D5F6246 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C56D5F6246 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 15 Mar 2017 13:56:57 +0100 Message-Id: <1489582656-31133-9-git-send-email-armbru@redhat.com> In-Reply-To: <1489582656-31133-1-git-send-email-armbru@redhat.com> References: <1489582656-31133-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 15 Mar 2017 12:57:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 for-2.9 08/47] tests/qapi-schema: Cover empty union base X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The new test case shows off qapi.py choking on an empty union base. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- tests/Makefile.include | 1 + tests/qapi-schema/union-base-empty.err | 10 ++++++++++ tests/qapi-schema/union-base-empty.exit | 1 + tests/qapi-schema/union-base-empty.json | 9 +++++++++ tests/qapi-schema/union-base-empty.out | 0 5 files changed, 21 insertions(+) create mode 100644 tests/qapi-schema/union-base-empty.err create mode 100644 tests/qapi-schema/union-base-empty.exit create mode 100644 tests/qapi-schema/union-base-empty.json create mode 100644 tests/qapi-schema/union-base-empty.out diff --git a/tests/Makefile.include b/tests/Makefile.include index 16e0a9f..3e640a8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -476,6 +476,7 @@ qapi-schema +=3D unclosed-list.json qapi-schema +=3D unclosed-object.json qapi-schema +=3D unclosed-string.json qapi-schema +=3D unicode-str.json +qapi-schema +=3D union-base-empty.json qapi-schema +=3D union-base-no-discriminator.json qapi-schema +=3D union-branch-case.json qapi-schema +=3D union-clash-branches.json diff --git a/tests/qapi-schema/union-base-empty.err b/tests/qapi-schema/uni= on-base-empty.err new file mode 100644 index 0000000..26bfa07 --- /dev/null +++ b/tests/qapi-schema/union-base-empty.err @@ -0,0 +1,10 @@ +Traceback (most recent call last): + File "tests/qapi-schema/test-qapi.py", line 56, in + schema =3D QAPISchema(sys.argv[1]) + File "scripts/qapi.py", line 1487, in __init__ + self.exprs =3D check_exprs(parser.exprs) + File "scripts/qapi.py", line 921, in check_exprs + check_union(expr, info) + File "scripts/qapi.py", line 738, in check_union + assert base_members +AssertionError diff --git a/tests/qapi-schema/union-base-empty.exit b/tests/qapi-schema/un= ion-base-empty.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/qapi-schema/union-base-empty.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/union-base-empty.json b/tests/qapi-schema/un= ion-base-empty.json new file mode 100644 index 0000000..d1843d3 --- /dev/null +++ b/tests/qapi-schema/union-base-empty.json @@ -0,0 +1,9 @@ +# Flat union with empty base and therefore without discriminator + +{ 'struct': 'Empty', 'data': { } } + +{ 'union': 'TestUnion', + 'base': 'Empty', + 'discriminator': 'type', + 'data': { 'value1': 'int', + 'value2': 'str' } } diff --git a/tests/qapi-schema/union-base-empty.out b/tests/qapi-schema/uni= on-base-empty.out new file mode 100644 index 0000000..e69de29 --=20 2.7.4