External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-03 20:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
d0819b9f02
libvirt/tests/virschematest.c

365 lines
10 KiB
C
Raw Normal View History

Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
/*
* Copyright (C) 2016 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include "testutils.h"
#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virxml.h"
#define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("tests.schematest");
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
struct testSchemaEntry {
const char *dir;
virschematest: Add regex filtering for directory contents In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:25:52 +00:00
/* if dirRegex is non-NULL the provided regular expression is used to match
* the file names in a directory (without path prefixed) and only matching
* files are validated */
const char *dirRegex;
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
const char *file;
};
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
struct testSchemaData {
virXMLValidatorPtr validator;
const char *xml_path;
};
static int
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
testSchemaValidateXML(const void *args)
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
{
const struct testSchemaData *data = args;
Use virStringHasSuffix() where possible When dealing with internal paths we don't need to worry about whether or not suffixes are lowercase since we have full control over them, which means we can avoid performing case-insensitive string comparisons. Signed-off-by: Andrea Bolognani <abologna@redhat.com> ACKed-by: Peter Krempa <pkrempa@redhat.com>
2019-03-07 08:40:54 +00:00
bool shouldFail = virStringHasSuffix(data->xml_path, "-invalid.xml");
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
g_autoptr(xmlDoc) xml = NULL;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
if (!(xml = virXMLParseFile(data->xml_path)))
return -1;
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
if ((virXMLValidatorValidate(data->validator, xml) < 0) != shouldFail)
return -1;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
return 0;
}
static int
testSchemaFile(const char *schema,
virXMLValidatorPtr validator,
const char *path)
{
g_autofree char *test_name = NULL;
struct testSchemaData data = {
.validator = validator,
.xml_path = path,
};
test_name = g_strdup_printf("Checking %s against %s", path, schema);
return virTestRun(test_name, testSchemaValidateXML, &data);
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
}
static int
testSchemaDir(const char *schema,
virXMLValidatorPtr validator,
virschematest: Add regex filtering for directory contents In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:25:52 +00:00
const char *dir_path,
const char *filterstr)
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
{
change DIR* int g_autoptr(DIR) where appropriate All of these conversions are trivial - VIR_DIR_CLOSE() (aka virDirClose()) is called only once on the DIR*, and it happens just before going out of scope. Signed-off-by: Laine Stump <laine@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-10-25 21:50:51 +00:00
g_autoptr(DIR) dir = NULL;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
struct dirent *ent;
int ret = 0;
int rc;
virschematest: Add regex filtering for directory contents In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:25:52 +00:00
g_autoptr(GRegex) filter = NULL;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
tests: virschema: Propagate errors from directory traversal in testSchemaDir testSchemaDir is a helper which invokes the schema test using virTestRun on all schema files. Since the function itself is not called inside virTestRun any helper function call is not dispatched to the user and thus it's hard to debug the test. Propagate errors from the directory traversal. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-11-19 10:55:05 +00:00
if (virDirOpen(&dir, dir_path) < 0) {
virTestPropagateLibvirtError();
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
return -1;
tests: virschema: Propagate errors from directory traversal in testSchemaDir testSchemaDir is a helper which invokes the schema test using virTestRun on all schema files. Since the function itself is not called inside virTestRun any helper function call is not dispatched to the user and thus it's hard to debug the test. Propagate errors from the directory traversal. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-11-19 10:55:05 +00:00
}
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
virschematest: Add regex filtering for directory contents In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:25:52 +00:00
if (filterstr) {
g_autoptr(GError) err = NULL;
if (!(filter = g_regex_new(filterstr, 0, 0, &err))) {
VIR_TEST_VERBOSE("\nfailed to compile regex '%s': %s", filterstr, err->message);
return -1;
}
}
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
while ((rc = virDirRead(dir, &ent, dir_path)) > 0) {
tests: schema: Simplify memory handling using g_autofree Refactor various functions to avoid multiple freeing function calls. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-11-19 10:16:34 +00:00
g_autofree char *xml_path = NULL;
Use virStringHasSuffix() where possible When dealing with internal paths we don't need to worry about whether or not suffixes are lowercase since we have full control over them, which means we can avoid performing case-insensitive string comparisons. Signed-off-by: Andrea Bolognani <abologna@redhat.com> ACKed-by: Peter Krempa <pkrempa@redhat.com>
2019-03-07 08:40:54 +00:00
if (!virStringHasSuffix(ent->d_name, ".xml"))
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
continue;
tests: ignore XML files starting with a . If an editor has an XML file open, it may create a temporary . file. The existance of this file will cause the virschematest to fail, so just skip these editor temp files. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-12-17 13:17:26 +00:00
if (ent->d_name[0] == '.')
continue;
virschematest: Add regex filtering for directory contents In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:25:52 +00:00
if (filter &&
!g_regex_match(filter, ent->d_name, 0, NULL))
continue;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
tests: Use g_strdup_printf() instead of virAsprintf() Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2019-10-22 13:26:14 +00:00
xml_path = g_strdup_printf("%s/%s", dir_path, ent->d_name);
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
if (testSchemaFile(schema, validator, xml_path) < 0)
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
ret = -1;
}
tests: virschema: Propagate errors from directory traversal in testSchemaDir testSchemaDir is a helper which invokes the schema test using virTestRun on all schema files. Since the function itself is not called inside virTestRun any helper function call is not dispatched to the user and thus it's hard to debug the test. Propagate errors from the directory traversal. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-11-19 10:55:05 +00:00
if (rc < 0) {
virTestPropagateLibvirtError();
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
ret = -1;
tests: virschema: Propagate errors from directory traversal in testSchemaDir testSchemaDir is a helper which invokes the schema test using virTestRun on all schema files. Since the function itself is not called inside virTestRun any helper function call is not dispatched to the user and thus it's hard to debug the test. Propagate errors from the directory traversal. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-11-19 10:55:05 +00:00
}
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
return ret;
}
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
/**
* testSchemaGrammarReport:
*
* We need to parse the schema regardless since it's necessary also when tests
* are skipped using VIR_TEST_RANGE so this function merely reports whether the
* schema was parsed successfully via virTestRun.
*/
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
static int
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
testSchemaGrammarReport(const void *opaque)
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
{
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
const virXMLValidator *validator = opaque;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
if (!validator)
return -1;
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
return 0;
}
static virXMLValidatorPtr
testSchemaGrammarLoad(const char *schema)
{
g_autofree char *schema_path = NULL;
g_autofree char *testname = NULL;
virXMLValidatorPtr ret;
schema_path = g_strdup_printf("%s/%s", abs_top_srcdir, schema);
ret = virXMLValidatorInit(schema_path);
testname = g_strdup_printf("test schema grammar file: '%s'", schema);
ignore_value(virTestRun(testname, testSchemaGrammarReport, ret));
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
return ret;
}
tests: Make schema test fail on XML schema errors Failure to parse the schema file would not trigger a test suite failure. In addition to making the test fail it's necessary to split up the parsing of the schema file into a separate test. This is necessary as the XML validator uses libvirt errors to report problems parsing of the actual schema RNG needs to be split out into a separate function and called via virTestRun which has the infrastructure to report them.
2016-08-02 07:11:33 +00:00
static int
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
testSchemaEntries(const char *schema,
const struct testSchemaEntry *entries,
size_t nentries)
tests: Make schema test fail on XML schema errors Failure to parse the schema file would not trigger a test suite failure. In addition to making the test fail it's necessary to split up the parsing of the schema file into a separate test. This is necessary as the XML validator uses libvirt errors to report problems parsing of the actual schema RNG needs to be split out into a separate function and called via virTestRun which has the infrastructure to report them.
2016-08-02 07:11:33 +00:00
{
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
g_autoptr(virXMLValidator) validator = NULL;
size_t i;
int ret = 0;
tests: Make schema test fail on XML schema errors Failure to parse the schema file would not trigger a test suite failure. In addition to making the test fail it's necessary to split up the parsing of the schema file into a separate test. This is necessary as the XML validator uses libvirt errors to report problems parsing of the actual schema RNG needs to be split out into a separate function and called via virTestRun which has the infrastructure to report them.
2016-08-02 07:11:33 +00:00
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
if (!(validator = testSchemaGrammarLoad(schema)))
tests: schema: Simplify memory handling using g_autofree Refactor various functions to avoid multiple freeing function calls. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-11-19 10:16:34 +00:00
return -1;
tests: Make schema test fail on XML schema errors Failure to parse the schema file would not trigger a test suite failure. In addition to making the test fail it's necessary to split up the parsing of the schema file into a separate test. This is necessary as the XML validator uses libvirt errors to report problems parsing of the actual schema RNG needs to be split out into a separate function and called via virTestRun which has the infrastructure to report them.
2016-08-02 07:11:33 +00:00
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
for (i = 0; i < nentries; i++) {
const struct testSchemaEntry *entry = entries + i;
if (!entry->file == !entry->dir) {
VIR_TEST_VERBOSE("\nmust specify exactly one of 'dir' and 'file' for struct testSchemaEntry\n");
ret = -1;
continue;
}
if (entry->dir) {
g_autofree char *path = g_strdup_printf("%s/%s", abs_top_srcdir, entry->dir);
virschematest: Add regex filtering for directory contents In some cases we have directories with mixed XML files in the test suite. Adding regex filtering will allow testing subsets of the XML files against schema. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:25:52 +00:00
if (testSchemaDir(schema, validator, path, entry->dirRegex) < 0)
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
ret = -1;
}
if (entry->file) {
g_autofree char *path = g_strdup_printf("%s/%s", abs_top_srcdir, entry->file);
if (testSchemaFile(schema, validator, path) < 0)
ret = -1;
}
}
return ret;
tests: Make schema test fail on XML schema errors Failure to parse the schema file would not trigger a test suite failure. In addition to making the test fail it's necessary to split up the parsing of the schema file into a separate test. This is necessary as the XML validator uses libvirt errors to report problems parsing of the actual schema RNG needs to be split out into a separate function and called via virTestRun which has the infrastructure to report them.
2016-08-02 07:11:33 +00:00
}
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
static const struct testSchemaEntry schemaCapability[] = {
{ .dir = "tests/capabilityschemadata" },
{ .dir = "tests/vircaps2xmldata" },
virschematest: Validate more XMLs We weren't validating certain directories containing nwfilter, network and capability XML test files. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 11:58:24 +00:00
{ .dir = "tests/qemucaps2xmloutdata" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
static const struct testSchemaEntry schemaDomain[] = {
{ .dir = "tests/domainschemadata" },
{ .dir = "tests/qemuxml2argvdata" },
{ .dir = "tests/xmconfigdata" },
{ .dir = "tests/qemuxml2xmloutdata" },
{ .dir = "tests/lxcxml2xmldata" },
{ .dir = "tests/lxcxml2xmloutdata" },
{ .dir = "tests/bhyvexml2argvdata" },
{ .dir = "tests/bhyvexml2xmloutdata" },
{ .dir = "tests/genericxml2xmlindata" },
{ .dir = "tests/genericxml2xmloutdata" },
{ .dir = "tests/xlconfigdata" },
{ .dir = "tests/libxlxml2domconfigdata" },
{ .dir = "tests/qemuhotplugtestdomains" },
virschematest: Add coverage for 'examples/xml/test' Add all appropriate file from our test driver example XML directory. Note that the two 'node.*' files are actually custom for the test driver to load full state. We don't have a schema for them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .dir = "examples/xml/test/",
.dirRegex = "testdom.*" },
virschematest: Add directories containing domain XMLs Validate additional XML documents we use for internal testing. Specifically there's a lot of them belonging to the vmx and bhyve test suite which were not validated. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 09:40:39 +00:00
{ .dir = "tests/qemuhotplugtestcpus" },
{ .dir = "tests/securityselinuxlabeldata" },
{ .dir = "tests/domainconfdata" },
{ .dir = "tests/lxcconf2xmldata" },
{ .dir = "tests/qemumemlockdata" },
{ .dir = "tests/vmx2xmldata" },
{ .dir = "tests/xml2vmxdata" },
{ .dir = "tests/bhyveargv2xmldata" },
{ .dir = "tests/qemuagentdata" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
static const struct testSchemaEntry schemaDomainCaps[] = {
{ .dir = "tests/domaincapsdata" },
};
static const struct testSchemaEntry schemaDomainBackup[] = {
{ .dir = "tests/domainbackupxml2xmlin" },
{ .dir = "tests/domainbackupxml2xmlout" },
};
static const struct testSchemaEntry schemaDomainCheckpoint[] = {
{ .dir = "tests/qemudomaincheckpointxml2xmlin" },
{ .dir = "tests/qemudomaincheckpointxml2xmlout" },
};
static const struct testSchemaEntry schemaDomainSnapshot[] = {
{ .dir = "tests/qemudomainsnapshotxml2xmlin" },
{ .dir = "tests/qemudomainsnapshotxml2xmlout" },
};
static const struct testSchemaEntry schemaInterface[] = {
{ .dir = "tests/interfaceschemadata" },
};
static const struct testSchemaEntry schemaNetwork[] = {
{ .dir = "src/network" },
{ .dir = "tests/networkxml2xmlin" },
{ .dir = "tests/networkxml2xmlout" },
{ .dir = "tests/networkxml2confdata" },
virschematest: Add coverage for 'examples/xml/test' Add all appropriate file from our test driver example XML directory. Note that the two 'node.*' files are actually custom for the test driver to load full state. We don't have a schema for them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .dir = "examples/xml/test/",
.dirRegex = "testnet.*" },
virschematest: Validate more XMLs We weren't validating certain directories containing nwfilter, network and capability XML test files. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 11:58:24 +00:00
{ .dir = "tests/networkxml2xmlupdateout" },
{ .dir = "tests/networkxml2firewalldata" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
static const struct testSchemaEntry schemaNetworkport[] = {
{ .dir = "tests/virnetworkportxml2xmldata" },
};
static const struct testSchemaEntry schemaNodedev[] = {
{ .dir = "tests/nodedevschemadata" },
virschematest: Add coverage for 'examples/xml/test' Add all appropriate file from our test driver example XML directory. Note that the two 'node.*' files are actually custom for the test driver to load full state. We don't have a schema for them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .file = "examples/xml/test/testdev.xml" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
static const struct testSchemaEntry schemaNwfilter[] = {
{ .dir = "tests/nwfilterxml2xmlout" },
virschematest: Fix testing of 'nwfilter' xmls The files are under 'src/nwfilter/xml' Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 09:33:30 +00:00
{ .dir = "src/nwfilter/xml" },
virschematest: Validate more XMLs We weren't validating certain directories containing nwfilter, network and capability XML test files. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 11:58:24 +00:00
{ .dir = "tests/nwfilterxml2xmlin" },
{ .dir = "tests/nwfilterxml2firewalldata" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
static const struct testSchemaEntry schemaNwfilterbinding[] = {
{ .dir = "tests/virnwfilterbindingxml2xmldata" },
};
static const struct testSchemaEntry schemaSecret[] = {
{ .dir = "tests/secretxml2xmlin" },
};
static const struct testSchemaEntry schemaStoragepoolcaps[] = {
{ .dir = "tests/storagepoolcapsschemadata" },
};
static const struct testSchemaEntry schemaStoragePool[] = {
{ .dir = "tests/storagepoolxml2xmlin" },
{ .dir = "tests/storagepoolxml2xmlout" },
{ .dir = "tests/storagepoolschemadata" },
virschematest: Add coverage for 'examples/xml/storage' Match the correct subsets of the files via the 'dirRegex' property. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .dir = "examples/xml/storage",
.dirRegex = "pool-.*" },
virschematest: Add coverage for 'examples/xml/test' Add all appropriate file from our test driver example XML directory. Note that the two 'node.*' files are actually custom for the test driver to load full state. We don't have a schema for them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .file = "examples/xml/test/testpool.xml" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
static const struct testSchemaEntry schemaStorageVol[] = {
{ .dir = "tests/storagevolxml2xmlin" },
{ .dir = "tests/storagevolxml2xmlout" },
{ .dir = "tests/storagevolschemadata" },
virschematest: Add coverage for 'examples/xml/storage' Match the correct subsets of the files via the 'dirRegex' property. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .dir = "examples/xml/storage",
.dirRegex = "vol-.*" },
virschematest: Add coverage for 'examples/xml/test' Add all appropriate file from our test driver example XML directory. Note that the two 'node.*' files are actually custom for the test driver to load full state. We don't have a schema for them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-06 15:28:44 +00:00
{ .file = "examples/xml/test/testvol.xml" },
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
};
virschematest: Validate schema in tests/cputestdata We now have a schema file for the 'cpu' elements. Use it to validate files in 'tests/cputestdata' Unfortunately the files in the directory are too disorganised and not easy to split up to do something more straightforward. The -baseline- input files are tested by the test internally and the rest of the files are internal data feeding the tests so they don't need validation. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 14:52:14 +00:00
static const struct testSchemaEntry schemaCpu[] = {
{ . dir = "tests/cputestdata",
. dirRegex = "^[^-]+-cpuid-.*(-host|-guest|-json)\\.xml$" },
{ . dir = "tests/cputestdata",
. dirRegex = "^[^-]+-baseline-.*-result\\.xml$" },
{ . dir = "tests/cputestdata",
. dirRegex = "^[^-]+-(?!cpuid|baseline).*$" },
};
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
static int
mymain(void)
{
int ret = 0;
virschematest: Rewrite internals to allow increasing XML test coverage To allow greater variablitity of XML schema validation tests without needlessly reparsing the schema we need to refactor the internals to pass in structs rather than just paths to directory. This allows to directly implement testing of single files and will simplify further additions such as filtering of the list of XML files in a directory. The list of tested paths is directly ported for now and will be improved in follow-up patches. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 08:26:56 +00:00
#define DO_TEST(sch, ent) \
if (testSchemaEntries((sch), (ent), G_N_ELEMENTS(ent)) < 0) \
ret = -1;
DO_TEST("docs/schemas/capability.rng", schemaCapability);
DO_TEST("docs/schemas/domain.rng", schemaDomain);
DO_TEST("docs/schemas/domaincaps.rng", schemaDomainCaps);
DO_TEST("docs/schemas/domainbackup.rng", schemaDomainBackup);
DO_TEST("docs/schemas/domaincheckpoint.rng", schemaDomainCheckpoint);
DO_TEST("docs/schemas/domainsnapshot.rng", schemaDomainSnapshot);
DO_TEST("docs/schemas/interface.rng", schemaInterface);
DO_TEST("docs/schemas/network.rng", schemaNetwork);
DO_TEST("docs/schemas/networkport.rng", schemaNetworkport);
DO_TEST("docs/schemas/nodedev.rng", schemaNodedev);
DO_TEST("docs/schemas/nwfilter.rng", schemaNwfilter);
DO_TEST("docs/schemas/nwfilterbinding.rng", schemaNwfilterbinding);
DO_TEST("docs/schemas/secret.rng", schemaSecret);
DO_TEST("docs/schemas/storagepoolcaps.rng", schemaStoragepoolcaps);
DO_TEST("docs/schemas/storagepool.rng", schemaStoragePool);
DO_TEST("docs/schemas/storagevol.rng", schemaStorageVol);
virschematest: Validate schema in tests/cputestdata We now have a schema file for the 'cpu' elements. Use it to validate files in 'tests/cputestdata' Unfortunately the files in the directory are too disorganised and not easy to split up to do something more straightforward. The -baseline- input files are tested by the test internally and the rest of the files are internal data feeding the tests so they don't need validation. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-10-07 14:52:14 +00:00
DO_TEST("docs/schemas/cpu.rng", schemaCpu);
Introduce virschematest Instead of calling xmllint via a shell script, use our virXMLValidator API to do it directly via libxml.
2016-06-07 16:54:43 +00:00
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
tests: Rename VIRT_TEST_* macros to VIR_TEST_* We use the "vir" prefix pretty consistently in our APIs, both external and internal, which made these macros stood out.
2017-03-29 14:45:42 +00:00
VIR_TEST_MAIN(mymain)
Reference in New Issue Copy Permalink