tests: use virtTestDifferenceFull in tests where we have output file

This will enable regenerate functionality for those tests to make
developer lives easier while updating tests.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index cd91cfae48753b21880aaef76454c3f72019fad2..cf91447f2da32a0892d002cfaf05235dc646d7a8 100644 (file)
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -114,7 +114,7 @@ testCompareXMLToXMLFiles(const char *inxml,
     }
 
     if (STRNEQ(outXmlData, actual)) {
-        virtTestDifference(stderr, outXmlData, actual);
+        virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
         goto cleanup;
     }
 

diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index 65f516788ccb4c294ddd743c9c95397975b8acbf..ba3474635a300440b9151e596b2c5dc0736b4a05 100644 (file)
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
         goto fail;
 
     if (STRNEQ(xmlData, actual)) {
-        virtTestDifference(stderr, xmlData, actual);
+        virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
         goto fail;
     }
 

diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c
index ed21e8a389be256552b10b3b0aa33ac67d6ef709..fd5bc031cc6dab864e07b2bdc254fe7d4616bc51 100644 (file)
--- a/tests/lxcconf2xmltest.c
+++ b/tests/lxcconf2xmltest.c
@@ -51,7 +51,7 @@ testCompareXMLToConfigFiles(const char *xml,
             goto fail;
 
         if (STRNEQ(expectxml, actualxml)) {
-            virtTestDifference(stderr, expectxml, actualxml);
+            virtTestDifferenceFull(stderr, expectxml, xml, actualxml, NULL);
             goto fail;
         }
     }

diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index a37d7290cea062c4cce3c009c01e2ab300d38f09..0089b5dadffc39e3fd9913c12a568e4350b03125 100644 (file)
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
         goto fail;
 
     if (STRNEQ(xmlData, actual)) {
-        virtTestDifference(stderr, xmlData, actual);
+        virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
         goto fail;
     }
 

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 102e0522541964ad04d80a228ad70830d9b1a2b1..61ade25b200b1fc0f436b8cf83c0225a89ca2569 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -175,6 +175,7 @@ testQemuHotplugUpdate(virDomainObjPtr vm,
 static int
 testQemuHotplugCheckResult(virDomainObjPtr vm,
                            const char *expected,
+                           const char *expectedFile,
                            bool fail)
 {
     char *actual;
@@ -192,7 +193,9 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
         ret = 0;
     } else {
         if (!fail)
-            virtTestDifference(stderr, expected, actual);
+            virtTestDifferenceFull(stderr,
+                                   expected, expectedFile,
+                                   actual, NULL);
         ret = -1;
     }
 
@@ -294,13 +297,15 @@ testQemuHotplug(const void *data)
             VIR_FREE(dev);
         }
         if (ret == 0 || fail)
-            ret = testQemuHotplugCheckResult(vm, result_xml, fail);
+            ret = testQemuHotplugCheckResult(vm, result_xml,
+                                             result_filename, fail);
         break;
 
     case DETACH:
         ret = testQemuHotplugDetach(vm, dev);
         if (ret == 0 || fail)
-            ret = testQemuHotplugCheckResult(vm, domain_xml, fail);
+            ret = testQemuHotplugCheckResult(vm, domain_xml,
+                                             domain_filename, fail);
         break;
 
     case UPDATE: