diff options
author | Cole Robinson <crobinso@redhat.com> | 2015-04-23 11:14:26 -0400 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2015-04-23 17:08:48 -0400 |
commit | ca32929908bbc94116493ad8915e7cd7ae0f57d5 (patch) | |
tree | 8a16bac5dff57315ae91b10d3fdf7cc007419e43 /tests/nwfilterxml2xmltest.c | |
parent | bdbe26b50423f8c5df6f9f2804a0e93c87577394 (diff) | |
download | libvirt-ca32929908bbc94116493ad8915e7cd7ae0f57d5.tar.gz |
tests: Add virtTestCompareToFile
Replaces a common pattern used in many test files
Diffstat (limited to 'tests/nwfilterxml2xmltest.c')
-rw-r--r-- | tests/nwfilterxml2xmltest.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 7640af0cce..361a9a20e8 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -23,14 +23,10 @@ static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool expect_error) { - char *outXmlData = NULL; char *actual = NULL; int ret = -1; virNWFilterDefPtr dev = NULL; - if (virtTestLoadFile(outxml, &outXmlData) < 0) - goto fail; - virResetLastError(); if (!(dev = virNWFilterDefParseFile(inxml))) { @@ -44,16 +40,13 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, if (!(actual = virNWFilterDefFormat(dev))) goto fail; - if (STRNEQ(outXmlData, actual)) { - virtTestDifference(stderr, outXmlData, actual); + if (virtTestCompareToFile(actual, outxml) < 0) goto fail; - } done: ret = 0; fail: - VIR_FREE(outXmlData); VIR_FREE(actual); virNWFilterDefFree(dev); return ret; |