From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E35C0C433DB for ; Thu, 25 Mar 2021 14:25:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D9FF619FE for ; Thu, 25 Mar 2021 14:25:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D9FF619FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPQvs-00078B-6c for qemu-devel@archiver.kernel.org; Thu, 25 Mar 2021 10:25:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPQuK-0006e6-Dx for qemu-devel@nongnu.org; Thu, 25 Mar 2021 10:24:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPQuF-0006qT-HM for qemu-devel@nongnu.org; Thu, 25 Mar 2021 10:24:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616682254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=FJY+ujJCKIHKUxu0ZpzaM9HfxUlX4k11j8rDHd2pc2c=; b=aowaisA+JmuxM52o/GmXdENCLLoWKnN+KmZ8gMbo52vxDmkOA+suS3y+akTt+nZCrLwYun ldsILM8NJ4M/fQN/8EavQT9Bj0Emn0a7mKpRv9NKUwEXAtjngIqo06gtzYDAcO0mRlq8Hl hG/HZTho74aB8s6XLKYG8wjNnl3uSWk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-St2qzm69PyOjFw8cMNp51A-1; Thu, 25 Mar 2021 10:24:09 -0400 X-MC-Unique: St2qzm69PyOjFw8cMNp51A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1FA9100B789; Thu, 25 Mar 2021 14:24:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-17.ams2.redhat.com [10.36.114.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 863A05D9CA; Thu, 25 Mar 2021 14:24:08 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0375E11327E1; Thu, 25 Mar 2021 15:24:07 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH v4 08/19] qapi: add tests for invalid 'data' field type References: <20210325060356.4040114-1-jsnow@redhat.com> <20210325060356.4040114-9-jsnow@redhat.com> Date: Thu, 25 Mar 2021 15:24:06 +0100 In-Reply-To: <20210325060356.4040114-9-jsnow@redhat.com> (John Snow's message of "Thu, 25 Mar 2021 02:03:45 -0400") Message-ID: <87v99fs455.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Cleber Rosa , Markus Armbruster , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > It needs to be an object (dict), not anything else. > > Signed-off-by: John Snow > > --- > > Note: this actually doesn't ... work, but on-list, we discussed wanting > tests first, then the fix. That can't happen here, because QAPI crashes > at runtime. So uh, just squash this into the following patch, I guess? Yes. > I tried. Thanks! > Signed-off-by: John Snow > --- > tests/qapi-schema/alternate-invalid-data-type.err | 0 > tests/qapi-schema/alternate-invalid-data-type.json | 4 ++++ > tests/qapi-schema/alternate-invalid-data-type.out | 0 > tests/qapi-schema/meson.build | 2 ++ > tests/qapi-schema/union-invalid-data-type.err | 0 > tests/qapi-schema/union-invalid-data-type.json | 13 +++++++++++++ > tests/qapi-schema/union-invalid-data-type.out | 0 > 7 files changed, 19 insertions(+) > create mode 100644 tests/qapi-schema/alternate-invalid-data-type.err > create mode 100644 tests/qapi-schema/alternate-invalid-data-type.json > create mode 100644 tests/qapi-schema/alternate-invalid-data-type.out > create mode 100644 tests/qapi-schema/union-invalid-data-type.err > create mode 100644 tests/qapi-schema/union-invalid-data-type.json > create mode 100644 tests/qapi-schema/union-invalid-data-type.out > > diff --git a/tests/qapi-schema/alternate-invalid-data-type.err b/tests/qapi-schema/alternate-invalid-data-type.err > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/qapi-schema/alternate-invalid-data-type.json b/tests/qapi-schema/alternate-invalid-data-type.json > new file mode 100644 > index 0000000000..7d5d905581 > --- /dev/null > +++ b/tests/qapi-schema/alternate-invalid-data-type.json > @@ -0,0 +1,4 @@ > +# Alternate type requires an object for 'data' > +{ 'alternate': 'Alt', > + 'data': ['rubbish', 'nonsense'] > +} Let's name it alternate-data-invalid.json, for consistency with struct-data-invalid.json > diff --git a/tests/qapi-schema/alternate-invalid-data-type.out b/tests/qapi-schema/alternate-invalid-data-type.out > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build > index 8ba6917132..cc5b136cfb 100644 > --- a/tests/qapi-schema/meson.build > +++ b/tests/qapi-schema/meson.build > @@ -15,6 +15,7 @@ schemas = [ > 'alternate-conflict-bool-string.json', > 'alternate-conflict-num-string.json', > 'alternate-empty.json', > + 'alternate-invalid-data-type.json', > 'alternate-invalid-dict.json', > 'alternate-nested.json', > 'alternate-unknown.json', > @@ -192,6 +193,7 @@ schemas = [ > 'union-clash-branches.json', > 'union-empty.json', > 'union-invalid-base.json', > + 'union-invalid-data-type.json', > 'union-optional-branch.json', > 'union-unknown.json', > 'unknown-escape.json', > diff --git a/tests/qapi-schema/union-invalid-data-type.err b/tests/qapi-schema/union-invalid-data-type.err > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/qapi-schema/union-invalid-data-type.json b/tests/qapi-schema/union-invalid-data-type.json > new file mode 100644 > index 0000000000..5a32d267bf > --- /dev/null > +++ b/tests/qapi-schema/union-invalid-data-type.json > @@ -0,0 +1,13 @@ > +# the union data type must be an object. > + > +{ 'struct': 'TestTypeA', > + 'data': { 'string': 'str' } } > + > +{ 'struct': 'TestTypeB', > + 'data': { 'integer': 'int' } } These two seem superfluous. > + > +{ 'union': 'TestUnion', > + 'base': 'int', > + 'discriminator': 'int', > + 'data': ['TestTypeA', 'TestTypeB'] > +} Name it union-invalid-data.json. > diff --git a/tests/qapi-schema/union-invalid-data-type.out b/tests/qapi-schema/union-invalid-data-type.out > new file mode 100644 > index 0000000000..e69de29bb2