External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use *DefParseFile more

Browse Source
This commit is contained in:
Cole Robinson 2015-04-23 11:10:15 -04:00
parent 01f2f6c6c9
commit bdbe26b504
18 changed files with 31 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/bhyvexml2xmltest.c
View File

@ -14,20 +14,16 @@ static bhyveConn driver;
static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
{
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
virDomainDefPtr def = NULL;
int ret = -1;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
if (!(def = virDomainDefParseFile(inxml, driver.caps, driver.xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail;
if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_INACTIVE)))
@ -41,7 +37,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virDomainDefFree(def);

7
tests/domainconftest.c
View File

@ -43,7 +43,6 @@ struct testGetFilesystemData {
static int testGetFilesystem(const void *opaque)
{
int ret = -1;
char *xmlData = NULL;
virDomainDefPtr def = NULL;
char *filename = NULL;
const struct testGetFilesystemData *data = opaque;
@ -53,10 +52,7 @@ static int testGetFilesystem(const void *opaque)
abs_srcdir, data->filename) < 0)
goto cleanup;
if (virtTestLoadFile(filename, &xmlData) < 0)
goto cleanup;
if (!(def = virDomainDefParseString(xmlData, caps, xmlopt, 0)))
if (!(def = virDomainDefParseFile(filename, caps, xmlopt, 0)))
goto cleanup;
fsdef = virDomainGetFilesystemForTarget(def,
@ -79,7 +75,6 @@ static int testGetFilesystem(const void *opaque)
cleanup:
virDomainDefFree(def);
VIR_FREE(xmlData);
VIR_FREE(filename);
return ret;
}

8
tests/lxcxml2xmltest.c
View File

@ -25,19 +25,16 @@ static virDomainXMLOptionPtr xmlopt;
static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live)
{
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virDomainDefPtr def = NULL;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
if (!(def = virDomainDefParseString(inXmlData, caps, xmlopt,
live ? 0 : VIR_DOMAIN_DEF_PARSE_INACTIVE)))
if (!(def = virDomainDefParseFile(inxml, caps, xmlopt,
live ? 0 : VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail;
if (!virDomainDefCheckABIStability(def, def)) {
@ -55,7 +52,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live)
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virDomainDefFree(def);

7
tests/networkxml2conftest.c
View File

@ -21,7 +21,6 @@
static int
testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr caps)
{
char *inXmlData = NULL;
char *outConfData = NULL;
char *actual = NULL;
int ret = -1;
@ -31,13 +30,10 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
char *pidfile = NULL;
dnsmasqContext *dctx = NULL;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outconf, &outConfData) < 0)
goto fail;
if (!(dev = virNetworkDefParseString(inXmlData)))
if (!(dev = virNetworkDefParseFile(inxml)))
goto fail;
if (!(obj = virNetworkObjNew()))
@ -61,7 +57,6 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outConfData);
VIR_FREE(actual);
VIR_FREE(pidfile);

6
tests/networkxml2xmltest.c
View File

@ -20,18 +20,15 @@ static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
unsigned int flags)
{
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virNetworkDefPtr dev = NULL;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
if (!(dev = virNetworkDefParseString(inXmlData)))
if (!(dev = virNetworkDefParseFile(inxml)))
goto fail;
if (!(actual = virNetworkDefFormat(dev, flags)))
@ -45,7 +42,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virNetworkDefFree(dev);

6
tests/networkxml2xmlupdatetest.c
View File

@ -22,19 +22,16 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
unsigned int command, unsigned int section,
int parentIndex, bool expectFailure)
{
char *netXmlData = NULL;
char *updateXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virNetworkDefPtr def = NULL;
if (virtTestLoadFile(netxml, &netXmlData) < 0)
goto error;
if (virtTestLoadFile(updatexml, &updateXmlData) < 0)
goto error;
if (!(def = virNetworkDefParseString(netXmlData)))
if (!(def = virNetworkDefParseFile(netxml)))
goto fail;
if (virNetworkDefUpdateSection(def, command, section, parentIndex,
@ -67,7 +64,6 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
}
}
error:
VIR_FREE(netXmlData);
VIR_FREE(updateXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);

6
tests/nwfilterxml2xmltest.c
View File

@ -23,20 +23,17 @@ static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
bool expect_error)
{
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virNWFilterDefPtr dev = NULL;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
virResetLastError();
if (!(dev = virNWFilterDefParseString(inXmlData))) {
if (!(dev = virNWFilterDefParseFile(inxml))) {
if (expect_error) {
virResetLastError();
goto done;
@ -56,7 +53,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virNWFilterDefFree(dev);

9
tests/qemuagenttest.c
View File

@ -170,7 +170,6 @@ testQemuAgentGetFSInfo(const void *data)
virCapsPtr caps = testQemuCapsInit();
qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt);
char *domain_filename = NULL;
char *domain_xml = NULL;
virDomainDefPtr def = NULL;
virDomainFSInfoPtr *info = NULL;
int ret = -1, ninfo = 0, i;
@ -182,11 +181,8 @@ testQemuAgentGetFSInfo(const void *data)
abs_srcdir) < 0)
goto cleanup;
if (virtTestLoadFile(domain_filename, &domain_xml) < 0)
goto cleanup;
if (!(def = virDomainDefParseString(domain_xml, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
if (!(def = virDomainDefParseFile(domain_filename, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup;
if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
@ -297,7 +293,6 @@ testQemuAgentGetFSInfo(const void *data)
virDomainFSInfoFree(info[i]);
VIR_FREE(info);
VIR_FREE(domain_filename);
VIR_FREE(domain_xml);
virObjectUnref(caps);
virDomainDefFree(def);
qemuMonitorTestFree(test);

6
tests/secretxml2xmltest.c
View File

@ -11,18 +11,15 @@
static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
{
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virSecretDefPtr secret = NULL;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
if (!(secret = virSecretDefParseString(inXmlData)))
if (!(secret = virSecretDefParseFile(inxml)))
goto fail;
if (!(actual = virSecretDefFormat(secret)))
@ -36,7 +33,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virSecretDefFree(secret);

7
tests/securityselinuxlabeltest.c
View File

@ -182,7 +182,6 @@ static virDomainDefPtr
testSELinuxLoadDef(const char *testname)
{
char *xmlfile = NULL;
char *xmlstr = NULL;
virDomainDefPtr def = NULL;
size_t i;
@ -190,10 +189,7 @@ testSELinuxLoadDef(const char *testname)
abs_srcdir, testname) < 0)
goto cleanup;
if (virFileReadAll(xmlfile, 1024*1024, &xmlstr) < 0)
goto cleanup;
if (!(def = virDomainDefParseString(xmlstr, caps, xmlopt, 0)))
if (!(def = virDomainDefParseFile(xmlfile, caps, xmlopt, 0)))
goto cleanup;
for (i = 0; i < def->ndisks; i++) {
@ -230,7 +226,6 @@ testSELinuxLoadDef(const char *testname)
cleanup:
VIR_FREE(xmlfile);
VIR_FREE(xmlstr);
return def;
}

20
tests/storagebackendsheepdogtest.c
View File

@ -50,13 +50,9 @@ test_node_info_parser(collie_test test, char *poolxml)
{
int ret = -1;
char *output = NULL;
char *poolXmlData = NULL;
virStoragePoolDefPtr pool = NULL;
if (virtTestLoadFile(poolxml, &poolXmlData) < 0)
goto cleanup;
if (!(pool = virStoragePoolDefParseString(poolXmlData)))
if (!(pool = virStoragePoolDefParseFile(poolxml)))
goto cleanup;
if (VIR_STRDUP(output, test.output) < 0)
@ -77,7 +73,6 @@ test_node_info_parser(collie_test test, char *poolxml)
cleanup:
VIR_FREE(output);
VIR_FREE(poolXmlData);
virStoragePoolDefFree(pool);
return ret;
}
@ -86,21 +81,14 @@ static int
test_vdi_list_parser(collie_test test, char *poolxml, char *volxml)
{
int ret = -1;
char *poolXmlData = NULL;
char *volXmlData = NULL;
char *output = NULL;
virStoragePoolDefPtr pool = NULL;
virStorageVolDefPtr vol = NULL;
if (virtTestLoadFile(poolxml, &poolXmlData) < 0)
goto cleanup;
if (virtTestLoadFile(volxml, &volXmlData) < 0)
if (!(pool = virStoragePoolDefParseFile(poolxml)))
goto cleanup;
if (!(pool = virStoragePoolDefParseString(poolXmlData)))
goto cleanup;
if (!(vol = virStorageVolDefParseString(pool, volXmlData, 0)))
if (!(vol = virStorageVolDefParseFile(pool, volxml, 0)))
goto cleanup;
if (VIR_STRDUP(output, test.output) < 0)
@ -121,8 +109,6 @@ test_vdi_list_parser(collie_test test, char *poolxml, char *volxml)
cleanup:
VIR_FREE(output);
VIR_FREE(poolXmlData);
VIR_FREE(volXmlData);
virStoragePoolDefFree(pool);
virStorageVolDefFree(vol);
return ret;

6
tests/storagepoolxml2xmltest.c
View File

@ -19,18 +19,15 @@
static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
{
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virStoragePoolDefPtr dev = NULL;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
if (!(dev = virStoragePoolDefParseString(inXmlData)))
if (!(dev = virStoragePoolDefParseFile(inxml)))
goto fail;
if (!(actual = virStoragePoolDefFormat(dev)))
@ -44,7 +41,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
ret = 0;
fail:
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virStoragePoolDefFree(dev);

26
tests/storagevolxml2argvtest.c
View File

@ -43,10 +43,6 @@ testCompareXMLToArgvFiles(bool shouldFail,
int imgformat,
unsigned long parse_flags)
{
char *volXmlData = NULL;
char *poolXmlData = NULL;
char *inputpoolXmlData = NULL;
char *inputvolXmlData = NULL;
char *expectedCmdline = NULL;
char *actualCmdline = NULL;
int ret = -1;
@ -65,34 +61,24 @@ testCompareXMLToArgvFiles(bool shouldFail,
if (!(conn = virGetConnect()))
goto cleanup;
if (virtTestLoadFile(poolxml, &poolXmlData) < 0)
goto cleanup;
if (virtTestLoadFile(volxml, &volXmlData) < 0)
goto cleanup;
if (inputvolxml &&
virtTestLoadFile(inputvolxml, &inputvolXmlData) < 0)
goto cleanup;
if (!(pool = virStoragePoolDefParseString(poolXmlData)))
if (!(pool = virStoragePoolDefParseFile(poolxml)))
goto cleanup;
poolobj.def = pool;
if (inputpoolxml) {
if (virtTestLoadFile(inputpoolxml, &inputpoolXmlData) < 0)
goto cleanup;
if (!(inputpool = virStoragePoolDefParseString(inputpoolXmlData)))
if (!(inputpool = virStoragePoolDefParseFile(inputpoolxml)))
goto cleanup;
}
if (inputvolxml)
parse_flags |= VIR_VOL_XML_PARSE_NO_CAPACITY;
if (!(vol = virStorageVolDefParseString(pool, volXmlData, parse_flags)))
if (!(vol = virStorageVolDefParseFile(pool, volxml, parse_flags)))
goto cleanup;
if (inputvolxml &&
!(inputvol = virStorageVolDefParseString(inputpool, inputvolXmlData, 0)))
!(inputvol = virStorageVolDefParseFile(inputpool, inputvolxml, 0)))
goto cleanup;
testSetVolumeType(vol, pool);
@ -133,10 +119,6 @@ testCompareXMLToArgvFiles(bool shouldFail,
virCommandFree(cmd);
VIR_FREE(actualCmdline);
VIR_FREE(expectedCmdline);
VIR_FREE(inputpoolXmlData);
VIR_FREE(poolXmlData);
VIR_FREE(volXmlData);
VIR_FREE(inputvolXmlData);
virObjectUnref(conn);
return ret;
}

12
tests/storagevolxml2xmltest.c
View File

@ -20,25 +20,19 @@ static int
testCompareXMLToXMLFiles(const char *poolxml, const char *inxml,
const char *outxml, unsigned int flags)
{
char *poolXmlData = NULL;
char *inXmlData = NULL;
char *outXmlData = NULL;
char *actual = NULL;
int ret = -1;
virStoragePoolDefPtr pool = NULL;
virStorageVolDefPtr dev = NULL;
if (virtTestLoadFile(poolxml, &poolXmlData) < 0)
goto fail;
if (virtTestLoadFile(inxml, &inXmlData) < 0)
goto fail;
if (virtTestLoadFile(outxml, &outXmlData) < 0)
goto fail;
if (!(pool = virStoragePoolDefParseString(poolXmlData)))
if (!(pool = virStoragePoolDefParseFile(poolxml)))
goto fail;
if (!(dev = virStorageVolDefParseString(pool, inXmlData, flags)))
if (!(dev = virStorageVolDefParseFile(pool, inxml, flags)))
goto fail;
if (!(actual = virStorageVolDefFormat(pool, dev)))
@ -52,8 +46,6 @@ testCompareXMLToXMLFiles(const char *poolxml, const char *inxml,
ret = 0;
fail:
VIR_FREE(poolXmlData);
VIR_FREE(inXmlData);
VIR_FREE(outXmlData);
VIR_FREE(actual);
virStoragePoolDefFree(pool);

9
tests/xlconfigtest.c
View File

@ -48,7 +48,6 @@ static virDomainXMLOptionPtr xmlopt;
static int
testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
{
char *xmlData = NULL;
char *xmcfgData = NULL;
char *gotxmcfgData = NULL;
virConfPtr conf = NULL;
@ -63,14 +62,11 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
conn = virGetConnect();
if (!conn) goto fail;
if (virtTestLoadFile(xml, &xmlData) < 0)
goto fail;
if (virtTestLoadFile(xmcfg, &xmcfgData) < 0)
goto fail;
if (!(def = virDomainDefParseString(xmlData, caps, xmlopt,
VIR_DOMAIN_XML_INACTIVE)))
if (!(def = virDomainDefParseFile(xml, caps, xmlopt,
VIR_DOMAIN_XML_INACTIVE)))
goto fail;
if (!virDomainDefCheckABIStability(def, def)) {
@ -93,7 +89,6 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
ret = 0;
fail:
VIR_FREE(xmlData);
VIR_FREE(xmcfgData);
VIR_FREE(gotxmcfgData);
if (conf)

9
tests/xmconfigtest.c
View File

@ -45,7 +45,6 @@ static virDomainXMLOptionPtr xmlopt;
static int
testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
{
char *xmlData = NULL;
char *xmcfgData = NULL;
char *gotxmcfgData = NULL;
virConfPtr conf = NULL;
@ -61,9 +60,6 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
conn = virGetConnect();
if (!conn) goto fail;
if (virtTestLoadFile(xml, &xmlData) < 0)
goto fail;
if (virtTestLoadFile(xmcfg, &xmcfgData) < 0)
goto fail;
@ -72,8 +68,8 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
priv.caps = caps;
conn->privateData = &priv;
if (!(def = virDomainDefParseString(xmlData, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
if (!(def = virDomainDefParseFile(xml, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail;
if (!virDomainDefCheckABIStability(def, def)) {
@ -96,7 +92,6 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
ret = 0;
fail:
VIR_FREE(xmlData);
VIR_FREE(xmcfgData);
VIR_FREE(gotxmcfgData);
if (conf)

9
tests/xml2sexprtest.c
View File

@ -23,20 +23,16 @@ static virDomainXMLOptionPtr xmlopt;
static int
testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
{
char *xmlData = NULL;
char *sexprData = NULL;
char *gotsexpr = NULL;
int ret = -1;
virDomainDefPtr def = NULL;
if (virtTestLoadFile(xml, &xmlData) < 0)
goto fail;
if (virtTestLoadFile(sexpr, &sexprData) < 0)
goto fail;
if (!(def = virDomainDefParseString(xmlData, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
if (!(def = virDomainDefParseFile(xml, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail;
if (!virDomainDefCheckABIStability(def, def)) {
@ -55,7 +51,6 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
ret = 0;
fail:
VIR_FREE(xmlData);
VIR_FREE(sexprData);
VIR_FREE(gotsexpr);
virDomainDefFree(def);

9
tests/xml2vmxtest.c
View File

@ -73,19 +73,15 @@ static int
testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
{
int result = -1;
char *xmlData = NULL;
char *vmxData = NULL;
char *formatted = NULL;
virDomainDefPtr def = NULL;
if (virtTestLoadFile(xml, &xmlData) < 0)
goto failure;
if (virtTestLoadFile(vmx, &vmxData) < 0)
goto failure;
def = virDomainDefParseString(xmlData, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE);
def = virDomainDefParseFile(xml, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE);
if (def == NULL)
goto failure;
@ -108,7 +104,6 @@ testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
result = 0;
failure:
VIR_FREE(xmlData);
VIR_FREE(vmxData);
VIR_FREE(formatted);
virDomainDefFree(def);