NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add virtTestCompareToFile

Browse Source 
Replaces a common pattern used in many test files
This commit is contained in:
Cole Robinson
2015-04-23 11:14:26 -04:00
parent bdbe26b504
commit ca32929908
32 changed files with 78 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/networkxml2conftest.c
View File

@@ -21,7 +21,6 @@
static int
testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr caps)
{
char *outConfData = NULL;
char *actual = NULL;
int ret = -1;
virNetworkDefPtr dev = NULL;
@@ -30,9 +29,6 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
char *pidfile = NULL;
dnsmasqContext *dctx = NULL;
if (virtTestLoadFile(outconf, &outConfData) < 0)
goto fail;
if (!(dev = virNetworkDefParseFile(inxml)))
goto fail;
@@ -49,15 +45,12 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
dctx, caps) < 0)
goto fail;
if (STRNEQ(outConfData, actual)) {
virtTestDifference(stderr, outConfData, actual);
if (virtTestCompareToFile(actual, outconf) < 0)
goto fail;
}
ret = 0;
fail:
VIR_FREE(outConfData);
VIR_FREE(actual);
VIR_FREE(pidfile);
virCommandFree(cmd);