From nobody Sun Apr 28 08:26:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1529561550358553.0444650173207; Wed, 20 Jun 2018 23:12:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7EEA30C10F2; Thu, 21 Jun 2018 06:12:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE3BF5D6A8; Thu, 21 Jun 2018 06:12:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D7A731800537; Thu, 21 Jun 2018 06:12:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5L6C9rH005434 for ; Thu, 21 Jun 2018 02:12:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 444E82026D6D; Thu, 21 Jun 2018 06:12:09 +0000 (UTC) Received: from vhost2.laine.org (ovpn-116-123.phx2.redhat.com [10.3.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id D86612026D6B for ; Thu, 21 Jun 2018 06:12:08 +0000 (UTC) From: Laine Stump To: libvir-list@redhat.com Date: Thu, 21 Jun 2018 02:12:03 -0400 Message-Id: <20180621061203.373789-1-laine@laine.org> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] schema: allow a element with no subelements in a nwfilter X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 21 Jun 2018 06:12:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is a regression in behavior caused by commit 37359814. It was intended to limit the schema to allow only a single subelement of , but it is also acceptable for to have no subelement at all. To prevent the same error from reoccurring in the future, the examples/xml/nwfilter directory was added to the list of nwfilter schema test directories. Resolves: https://bugzilla.redhat.com/1593549 Signed-off-by: Laine Stump --- docs/schemas/nwfilter.rng | 1 + tests/virschematest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index cca6ff2954..17cda5c78d 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -20,6 +20,7 @@ + diff --git a/tests/virschematest.c b/tests/virschematest.c index 2d35833919..aa65a434ff 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -229,7 +229,7 @@ mymain(void) DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin", "networkxml2xmlout", "networkxml2confdata"); DO_TEST_DIR("nodedev.rng", "nodedevschemadata"); - DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout"); + DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout", "../examples/xml/nwf= ilter"); DO_TEST_DIR("secret.rng", "secretxml2xmlin"); DO_TEST_DIR("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml= 2xmlout", "storagepoolschemadata"); --=20 2.14.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list