]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: Rename virtTestCompareToFile to virTestCompareToFile.
authorTomáš Ryšavý <tom.rysavy.0@gmail.com>
Thu, 26 May 2016 15:01:53 +0000 (17:01 +0200)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 8 Jun 2016 15:23:12 +0000 (11:23 -0400)
This function doesn't follow our convention of naming functions.

33 files changed:
tests/bhyvexml2argvtest.c
tests/cputest.c
tests/domaincapstest.c
tests/lxcconf2xmltest.c
tests/networkxml2conftest.c
tests/networkxml2firewalltest.c
tests/networkxml2xmltest.c
tests/networkxml2xmlupdatetest.c
tests/nodeinfotest.c
tests/nwfilterxml2firewalltest.c
tests/nwfilterxml2xmltest.c
tests/qemuargv2xmltest.c
tests/qemucapabilitiestest.c
tests/qemucaps2xmltest.c
tests/qemumonitorjsontest.c
tests/qemuxml2argvtest.c
tests/secretxml2xmltest.c
tests/sexpr2xmltest.c
tests/storagepoolxml2xmltest.c
tests/storagevolxml2argvtest.c
tests/storagevolxml2xmltest.c
tests/sysinfotest.c
tests/testutils.c
tests/testutils.h
tests/vircaps2xmltest.c
tests/vircgrouptest.c
tests/virnetdaemontest.c
tests/vmx2xmltest.c
tests/xencapstest.c
tests/xlconfigtest.c
tests/xmconfigtest.c
tests/xml2sexprtest.c
tests/xml2vmxtest.c

index 68d35dbf0bb3b335d03a704df4c21f1b7e5c2550..7a2d366ed2311d773776f0d573f0823995f4910e 100644 (file)
@@ -66,14 +66,14 @@ static int testCompareXMLToArgvFiles(const char *xml,
     if (!(actualld = virCommandToString(ldcmd)))
         goto out;
 
-    if (virtTestCompareToFile(actualargv, cmdline) < 0)
+    if (virTestCompareToFile(actualargv, cmdline) < 0)
         goto out;
 
-    if (virtTestCompareToFile(actualld, ldcmdline) < 0)
+    if (virTestCompareToFile(actualld, ldcmdline) < 0)
         goto out;
 
     if (virFileExists(dmcmdline) || actualdm) {
-        if (virtTestCompareToFile(actualdm, dmcmdline) < 0)
+        if (virTestCompareToFile(actualdm, dmcmdline) < 0)
             goto out;
     }
 
index 08909857a08625c84582d37efcc93ea3dcd6941e..c0e26beef216c21ab5a154ccdcc9125047470075 100644 (file)
@@ -168,7 +168,7 @@ cpuTestCompareXML(const char *arch,
     if (!(actual = virCPUDefFormat(cpu, NULL, updateCPU)))
         goto cleanup;
 
-    if (virtTestCompareToFile(actual, xml) < 0)
+    if (virTestCompareToFile(actual, xml) < 0)
         goto cleanup;
 
     ret = 0;
index 6cc511e7af25149608d1a77ae75fa2c0db8cf2d4..e1d067188d477168d47b4416bea4c9ed262e6bea 100644 (file)
@@ -217,7 +217,7 @@ test_virDomainCapsFormat(const void *opaque)
     if (!(domCapsXML = virDomainCapsFormat(domCaps)))
         goto cleanup;
 
-    if (virtTestCompareToFile(domCapsXML, path) < 0)
+    if (virTestCompareToFile(domCapsXML, path) < 0)
         goto cleanup;
 
     ret = 0;
index da8239d9b0b217177733b5ecc93dbc867b007f78..779b59061280464ff52b526fd382c691f41de6bb 100644 (file)
@@ -45,7 +45,7 @@ testCompareXMLToConfigFiles(const char *xmlfile,
         if (!(actualxml = virDomainDefFormat(vmdef, caps, 0)))
             goto fail;
 
-        if (virtTestCompareToFile(actualxml, xmlfile) < 0)
+        if (virTestCompareToFile(actualxml, xmlfile) < 0)
             goto fail;
     }
 
index 9995636b5bb960ae4b4097c92ab377a43efc5ade..11e08c0b8ec2ba3838f3455ab82a9341ed0d3cc5 100644 (file)
@@ -45,7 +45,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
                         dctx, caps) < 0)
         goto fail;
 
-    if (virtTestCompareToFile(actual, outconf) < 0)
+    if (virTestCompareToFile(actual, outconf) < 0)
         goto fail;
 
     ret = 0;
index d779d05c6c475fe1b3900f23164acda63284ef77..baf59043180cbc982424f674ec745bbf893a8794 100644 (file)
@@ -68,7 +68,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     virtTestClearCommandPath(actualargv);
     virCommandSetDryRun(NULL, NULL, NULL);
 
-    if (virtTestCompareToFile(actualargv, cmdline) < 0)
+    if (virTestCompareToFile(actualargv, cmdline) < 0)
         goto cleanup;
 
     ret = 0;
index 94b1c2977587b6837d55045d13724aa702a24867..d65f6aaf7e175d8d1a4527ec41e5bcf1a5d63b73 100644 (file)
@@ -47,7 +47,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
     if (expectResult == TEST_COMPARE_NET_XML2XML_RESULT_FAIL_FORMAT)
         goto cleanup;
 
-    if (virtTestCompareToFile(actual, outxml) < 0) {
+    if (virTestCompareToFile(actual, outxml) < 0) {
         result = TEST_COMPARE_NET_XML2XML_RESULT_FAIL_COMPARE;
         goto cleanup;
     }
index f33ddaf7fef70cc0eaac9cbb20b16a78650a1797..7b01abc6f9b12e189e5b3974798e5fd80fb19d2e 100644 (file)
@@ -41,7 +41,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
         goto fail;
 
     if (!expectFailure) {
-        if (virtTestCompareToFile(actual, outxml) < 0)
+        if (virTestCompareToFile(actual, outxml) < 0)
             goto error;
     }
 
index bfce0bdb2f9afe28136d4f67620ee4b908a78828..9eab2f689c93a817a3d9f4f1223fa7aa9807da81 100644 (file)
@@ -60,7 +60,7 @@ linuxTestCompareFiles(char *sysfs_prefix,
                     nodeinfo.cores, nodeinfo.threads) < 0)
         goto fail;
 
-    if (virtTestCompareToFile(actualData, outputfile) < 0)
+    if (virTestCompareToFile(actualData, outputfile) < 0)
         goto fail;
 
     ret = 0;
@@ -137,7 +137,7 @@ linuxCPUStatsCompareFiles(const char *cpustatfile,
         goto fail;
     }
 
-    if (virtTestCompareToFile(actualData, outfile) < 0)
+    if (virTestCompareToFile(actualData, outfile) < 0)
         goto fail;
 
     ret = 0;
index f53401999e27786251313e52e61a6114c87ec9df..205d3b6e161fdfeb1ffbf8c0484c4410b47d3c91 100644 (file)
@@ -405,7 +405,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
 
     testRemoveCommonRules(actualargv);
 
-    if (virtTestCompareToFile(actualargv, cmdline) < 0)
+    if (virTestCompareToFile(actualargv, cmdline) < 0)
         goto cleanup;
 
     ret = 0;
index b26b9dacf436b45212fcbf6cb2e237747a62c045..9beb8b663af938bbec76a33f7e1adc91d84b6335 100644 (file)
@@ -40,7 +40,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
     if (!(actual = virNWFilterDefFormat(dev)))
         goto fail;
 
-    if (virtTestCompareToFile(actual, outxml) < 0)
+    if (virTestCompareToFile(actual, outxml) < 0)
         goto fail;
 
  done:
index 45cc9c1d4e8a6643d7f1402018dbf60c1bbb79b3..25f0a693a8e1f4abe683b13bacfaecda25417696 100644 (file)
@@ -103,7 +103,7 @@ static int testCompareXMLToArgvFiles(const char *xmlfile,
     if (!(actualxml = virDomainDefFormat(vmdef, driver.caps, 0)))
         goto fail;
 
-    if (virtTestCompareToFile(actualxml, xmlfile) < 0)
+    if (virTestCompareToFile(actualxml, xmlfile) < 0)
         goto fail;
 
     ret = 0;
index 9637763fb3df5191c6f6b680d047e23ab140a839..8ee930996c78b9e1165025548ba0d4d6b201bd9f 100644 (file)
@@ -118,7 +118,7 @@ testQemuCaps(const void *opaque)
     if (!(actual = virQEMUCapsFormatCache(capsActual, 0, 0)))
         goto cleanup;
 
-    if (virtTestCompareToFile(actual, capsFile) < 0)
+    if (virTestCompareToFile(actual, capsFile) < 0)
         goto cleanup;
 
     ret = 0;
index 5f634d11839d457905ad6ecc69e832f85704b264..1b1ff7c1e6d1d042ae64f30a3d86d29af57b36fe 100644 (file)
@@ -145,7 +145,7 @@ testQemuCapsXML(const void *opaque)
     if (!capsXml)
         goto cleanup;
 
-    if (virtTestCompareToFile(capsXml, xmlFile) < 0)
+    if (virTestCompareToFile(capsXml, xmlFile) < 0)
         goto cleanup;
 
     ret = 0;
index 9dc2698a9bf073c36b506130bcd5e33f8213e9c0..957a80fb1cbb119c3ac89ecb783f108e1f49e16e 100644 (file)
@@ -2189,7 +2189,7 @@ testQemuMonitorJSONGetCPUData(const void *opaque)
     if (!(actual = cpuDataFormat(cpuData)))
         goto cleanup;
 
-    if (virtTestCompareToFile(actual, dataFile) < 0)
+    if (virTestCompareToFile(actual, dataFile) < 0)
         goto cleanup;
 
     ret = 0;
index 3e83e9912f5f07f3a4f0f5247928195ca96a2953..4776cc75dd47fdbaf50cfa011442a6a31a7b67f8 100644 (file)
@@ -340,7 +340,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     if (!(actualargv = virCommandToString(cmd)))
         goto out;
 
-    if (virtTestCompareToFile(actualargv, cmdline) < 0)
+    if (virTestCompareToFile(actualargv, cmdline) < 0)
         goto out;
 
     ret = 0;
index 14386a867d34b2cbcfdc77164365846729c30ac2..8dcbb40080b7e1d89c57d628e5033d2cbb47f2e6 100644 (file)
@@ -21,7 +21,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
     if (!(actual = virSecretDefFormat(secret)))
         goto fail;
 
-    if (virtTestCompareToFile(actual, outxml) < 0)
+    if (virTestCompareToFile(actual, outxml) < 0)
         goto fail;
 
     ret = 0;
index 19416fcfa9d1bb34880c1b87146f440cabd95fc5..9982fad9f714146c1ae55b81335dbf07ed1a6cb1 100644 (file)
@@ -65,7 +65,7 @@ testCompareFiles(const char *xml, const char *sexpr)
   if (!(gotxml = virDomainDefFormat(def, caps, 0)))
       goto fail;
 
-  if (virtTestCompareToFile(gotxml, xml) < 0)
+  if (virTestCompareToFile(gotxml, xml) < 0)
       goto fail;
 
   ret = 0;
index 05bc87c84784f669cb057ab49fc8a384a8f86e8e..2e1e811aecd4ecfc0587dbd3df342f273d697979 100644 (file)
@@ -29,7 +29,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
     if (!(actual = virStoragePoolDefFormat(dev)))
         goto fail;
 
-    if (virtTestCompareToFile(actual, outxml) < 0)
+    if (virTestCompareToFile(actual, outxml) < 0)
         goto fail;
 
     ret = 0;
index b2c4f3c6a064d6d340a3ad1b55a93213b2ebae92..8934471632b3ac7cdee21c9086248a1cdae5afa8 100644 (file)
@@ -95,7 +95,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
     if (!(actualCmdline = virCommandToString(cmd)))
         goto cleanup;
 
-    if (virtTestCompareToFile(actualCmdline, cmdline) < 0)
+    if (virTestCompareToFile(actualCmdline, cmdline) < 0)
         goto cleanup;
 
     ret = 0;
index 5076d1f60dc50a89eca5bb5f2f1da1115080f6e9..f722452eb2f48e8e039328ad2f4973f0a86858fb 100644 (file)
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *poolxml, const char *inxml,
     if (!(actual = virStorageVolDefFormat(pool, dev)))
         goto fail;
 
-    if (virtTestCompareToFile(actual, outxml) < 0)
+    if (virTestCompareToFile(actual, outxml) < 0)
         goto fail;
 
     ret = 0;
index 596f61f1099d21475755563b01804f6dad36e075..457c3415e47bd6da435d97a7b6da6885661e7992 100644 (file)
@@ -79,7 +79,7 @@ testSysinfo(const void *data)
     if (!(sysfsActualData = virBufferCurrentContent(&buf)))
         goto cleanup;
 
-    if (virtTestCompareToFile(sysfsActualData, testdata->expected) < 0)
+    if (virTestCompareToFile(sysfsActualData, testdata->expected) < 0)
         goto cleanup;
 
     result = 0;
index 2749cdfed0335b0151f8a6c002a0c6003e6a1cd4..0de048486a5330aedbbce12b64199bec31a07179 100644 (file)
@@ -686,8 +686,8 @@ int virtTestDifferenceBin(FILE *stream,
  * @param filename: File to compare strcontent against
  */
 int
-virtTestCompareToFile(const char *strcontent,
-                      const char *filename)
+virTestCompareToFile(const char *strcontent,
+                     const char *filename)
 {
     int ret = -1;
     char *filecontent = NULL;
@@ -1138,7 +1138,7 @@ testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt,
         goto out;
     }
 
-    if (virtTestCompareToFile(actual, outfile) < 0) {
+    if (virTestCompareToFile(actual, outfile) < 0) {
         result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_COMPARE;
         goto out;
     }
index c32af2c0e9dad8fe8400fea02ffd9f07f6b9168a..350401b2431c0e24cbfb225621ed453004529816 100644 (file)
@@ -73,8 +73,8 @@ int virtTestDifferenceBin(FILE *stream,
                           const char *expect,
                           const char *actual,
                           size_t length);
-int virtTestCompareToFile(const char *strcontent,
-                          const char *filename);
+int virTestCompareToFile(const char *strcontent,
+                         const char *filename);
 
 unsigned int virTestGetDebug(void);
 unsigned int virTestGetVerbose(void);
index 58fa995a4637c00835999a5a07f45c978b85528b..3e9e06bc0967fd62b18fd51b30a2bc42c307ae67 100644 (file)
@@ -120,7 +120,7 @@ test_virCapabilitiesFormat(const void *opaque)
                     abs_srcdir, data->filename) < 0)
         goto cleanup;
 
-    if (virtTestCompareToFile(capsXML, path) < 0)
+    if (virTestCompareToFile(capsXML, path) < 0)
         goto cleanup;
 
     ret = 0;
index 03ed087d77313ffd8778798684abbeea9c762a3c..9578e3aef51b2f8593684433408edd6a9a4a083b 100644 (file)
@@ -190,7 +190,7 @@ testCgroupDetectMounts(const void *args)
         goto cleanup;
 
     actual = virBufferCurrentContent(&buf);
-    if (virtTestCompareToFile(actual, parsed) < 0)
+    if (virTestCompareToFile(actual, parsed) < 0)
         goto cleanup;
 
     result = 0;
index 4537d11e20637a8dfbbfc478d63f025374e0528a..91030f42c0e00b4724f3acf56de35f3437faff78 100644 (file)
@@ -258,7 +258,7 @@ static int testExecRestart(const void *opaque)
     if (!(outjsonstr = virJSONValueToString(outjson, true)))
         goto cleanup;
 
-    if (virtTestCompareToFile(outjsonstr, outfile) < 0)
+    if (virTestCompareToFile(outjsonstr, outfile) < 0)
         goto cleanup;
 
     ret = 0;
index 549d365567e00627eed8062bfc7550b5e6dea021..9b59fd5ea74567a399157d4e7eeafb9d77dcc95a 100644 (file)
@@ -90,7 +90,7 @@ testCompareFiles(const char *vmx, const char *xml)
                                          VIR_DOMAIN_DEF_FORMAT_SECURE)))
         goto cleanup;
 
-    if (virtTestCompareToFile(formatted, xml) < 0)
+    if (virTestCompareToFile(formatted, xml) < 0)
         goto cleanup;
 
     ret = 0;
index d58822c0d512a467ac51b68882599c401501f915..0e83d8acf12bad1f1b5d30550c2d3e7d21186d35 100644 (file)
@@ -45,7 +45,7 @@ testCompareFiles(virArch hostmachine, const char *xml_rel,
   if (!(actualxml = virCapabilitiesFormatXML(caps)))
       goto fail;
 
-  if (virtTestCompareToFile(actualxml, xml) < 0)
+  if (virTestCompareToFile(actualxml, xml) < 0)
       goto fail;
 
   ret = 0;
index 0e2db0926d27965aff213644e7c6ffa8c6dbc9c1..62bb1441e1b8aae23c2e03d576072bc39ab9f51b 100644 (file)
@@ -79,7 +79,7 @@ testCompareParseXML(const char *xlcfg, const char *xml)
         goto fail;
     gotxlcfgData[wrote] = '\0';
 
-    if (virtTestCompareToFile(gotxlcfgData, xlcfg) < 0)
+    if (virTestCompareToFile(gotxlcfgData, xlcfg) < 0)
         goto fail;
 
     ret = 0;
@@ -124,7 +124,7 @@ testCompareFormatXML(const char *xlcfg, const char *xml)
                                       VIR_DOMAIN_XML_SECURE)))
         goto fail;
 
-    if (virtTestCompareToFile(gotxml, xml) < 0)
+    if (virTestCompareToFile(gotxml, xml) < 0)
         goto fail;
 
     ret = 0;
index ff283e7353d5d4ab693fb7b5dc0a570d1475414a..7032d43141c7cd9eff3401bdf159d70edf1741ac 100644 (file)
@@ -79,7 +79,7 @@ testCompareParseXML(const char *xmcfg, const char *xml)
         goto fail;
     gotxmcfgData[wrote] = '\0';
 
-    if (virtTestCompareToFile(gotxmcfgData, xmcfg) < 0)
+    if (virTestCompareToFile(gotxmcfgData, xmcfg) < 0)
         goto fail;
 
     ret = 0;
@@ -124,7 +124,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
     if (!(gotxml = virDomainDefFormat(def, caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
         goto fail;
 
-    if (virtTestCompareToFile(gotxml, xml) < 0)
+    if (virTestCompareToFile(gotxml, xml) < 0)
         goto fail;
 
     ret = 0;
index cc16b18a0d5c03fefa1825914043fe1138cd1cc1..77fea4a1677e992f3c9fca1107d1fc46b68da371 100644 (file)
@@ -39,7 +39,7 @@ testCompareFiles(const char *xml, const char *sexpr)
   if (!(gotsexpr = xenFormatSxpr(NULL, def)))
       goto fail;
 
-  if (virtTestCompareToFile(gotsexpr, sexpr) < 0)
+  if (virTestCompareToFile(gotsexpr, sexpr) < 0)
       goto fail;
 
   ret = 0;
index 517dc0ec48a75251b44a8f90b0c07dbf48bc13da..bf66152698a51301389eec7136174b96c638d458 100644 (file)
@@ -91,7 +91,7 @@ testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
     if (formatted == NULL)
         goto failure;
 
-    if (virtTestCompareToFile(formatted, vmx) < 0)
+    if (virTestCompareToFile(formatted, vmx) < 0)
         goto failure;
 
     result = 0;