提交 17b47342 编写于 作者: L Laine Stump

schema: allow a <rule> element with no subelements in a nwfilter

This is a regression in behavior caused by commit 37359814. It was
intended to limit the schema to allow only a single subelement of
<rule>, but it is also acceptable for <rule> 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/1593549Signed-off-by: NLaine Stump <laine@laine.org>
ACKed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 205462b6
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<element name="rule"> <element name="rule">
<ref name="rule-node-attributes"/> <ref name="rule-node-attributes"/>
<choice> <choice>
<empty/>
<element name="mac"> <element name="mac">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
......
...@@ -229,7 +229,7 @@ mymain(void) ...@@ -229,7 +229,7 @@ mymain(void)
DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin", DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin",
"networkxml2xmlout", "networkxml2confdata"); "networkxml2xmlout", "networkxml2confdata");
DO_TEST_DIR("nodedev.rng", "nodedevschemadata"); DO_TEST_DIR("nodedev.rng", "nodedevschemadata");
DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout"); DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout", "../examples/xml/nwfilter");
DO_TEST_DIR("secret.rng", "secretxml2xmlin"); DO_TEST_DIR("secret.rng", "secretxml2xmlin");
DO_TEST_DIR("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml2xmlout", DO_TEST_DIR("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml2xmlout",
"storagepoolschemadata"); "storagepoolschemadata");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册