[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 03/19] tests: Rename virtTestLoadFile to virTestLoadFile.



This function doesn't follow our convention of naming functions.
---
 tests/domainsnapshotxml2xmltest.c | 4 ++--
 tests/interfacexml2xmltest.c      | 2 +-
 tests/lxcconf2xmltest.c           | 2 +-
 tests/networkxml2xmlupdatetest.c  | 2 +-
 tests/nodedevxml2xmltest.c        | 2 +-
 tests/qemuargv2xmltest.c          | 2 +-
 tests/qemucapabilitiestest.c      | 2 +-
 tests/qemucaps2xmltest.c          | 2 +-
 tests/qemuhelptest.c              | 4 ++--
 tests/qemuhotplugtest.c           | 6 +++---
 tests/qemumonitorjsontest.c       | 2 +-
 tests/qemuxml2argvtest.c          | 2 +-
 tests/qemuxml2xmltest.c           | 4 ++--
 tests/sexpr2xmltest.c             | 2 +-
 tests/testutils.c                 | 4 ++--
 tests/testutils.h                 | 2 +-
 tests/vboxsnapshotxmltest.c       | 4 ++--
 tests/vmwarevertest.c             | 2 +-
 tests/vmx2xmltest.c               | 2 +-
 tests/xlconfigtest.c              | 2 +-
 tests/xmconfigtest.c              | 2 +-
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 21fb298..8e53b31 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -89,10 +89,10 @@ testCompareXMLToXMLFiles(const char *inxml,
     if (redefine)
         flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE;
 
-    if (virtTestLoadFile(inxml, &inXmlData) < 0)
+    if (virTestLoadFile(inxml, &inXmlData) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(outxml, &outXmlData) < 0)
+    if (virTestLoadFile(outxml, &outXmlData) < 0)
         goto cleanup;
 
     if (!(def = virDomainSnapshotDefParseString(inXmlData, driver.caps,
diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index 073ff7a..f817f00 100644
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -24,7 +24,7 @@ testCompareXMLToXMLFiles(const char *xml)
     int ret = -1;
     virInterfaceDefPtr dev = NULL;
 
-    if (virtTestLoadFile(xml, &xmlData) < 0)
+    if (virTestLoadFile(xml, &xmlData) < 0)
         goto fail;
 
     if (!(dev = virInterfaceDefParseString(xmlData)))
diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c
index 17994ec..7873210 100644
--- a/tests/lxcconf2xmltest.c
+++ b/tests/lxcconf2xmltest.c
@@ -31,7 +31,7 @@ testCompareXMLToConfigFiles(const char *xmlfile,
     char *actualxml = NULL;
     virDomainDefPtr vmdef = NULL;
 
-    if (virtTestLoadFile(configfile, &config) < 0)
+    if (virTestLoadFile(configfile, &config) < 0)
         goto fail;
 
     vmdef = lxcParseConfigString(config, caps, xmlopt);
diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c
index d2a093f..440d950 100644
--- a/tests/networkxml2xmlupdatetest.c
+++ b/tests/networkxml2xmlupdatetest.c
@@ -27,7 +27,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
     int ret = -1;
     virNetworkDefPtr def = NULL;
 
-    if (virtTestLoadFile(updatexml, &updateXmlData) < 0)
+    if (virTestLoadFile(updatexml, &updateXmlData) < 0)
         goto error;
 
     if (!(def = virNetworkDefParseFile(netxml)))
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index 09f9341..42dfa66 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -24,7 +24,7 @@ testCompareXMLToXMLFiles(const char *xml)
     int ret = -1;
     virNodeDeviceDefPtr dev = NULL;
 
-    if (virtTestLoadFile(xml, &xmlData) < 0)
+    if (virTestLoadFile(xml, &xmlData) < 0)
         goto fail;
 
     if (!(dev = virNodeDeviceDefParseString(xmlData, EXISTING_DEVICE, NULL)))
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 5e761d6..f1629bc 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -62,7 +62,7 @@ static int testCompareXMLToArgvFiles(const char *xmlfile,
     int ret = -1;
     virDomainDefPtr vmdef = NULL;
 
-    if (virtTestLoadFile(cmdfile, &cmd) < 0)
+    if (virTestLoadFile(cmdfile, &cmd) < 0)
         goto fail;
 
     if (!(vmdef = qemuParseCommandLineString(driver.caps, driver.xmlopt,
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 0cee801..cbad284 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -104,7 +104,7 @@ testQemuCaps(const void *opaque)
                     abs_srcdir, data->base, data->archName) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(repliesFile, &replies) < 0)
+    if (virTestLoadFile(repliesFile, &replies) < 0)
         goto cleanup;
 
     if (!(mon = testQemuFeedMonitor(replies, data->xmlopt)))
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 39d79a1..5f634d1 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -135,7 +135,7 @@ testQemuCapsXML(const void *opaque)
                     abs_srcdir, data->base) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(capsFile, &capsData) < 0)
+    if (virTestLoadFile(capsFile, &capsData) < 0)
         goto cleanup;
 
     if (!(capsProvided = testGetCaps(capsData, data)))
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 8746410..80a1eb5 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -52,7 +52,7 @@ static int testHelpStrParsing(const void *data)
     if (virAsprintf(&path, "%s/qemuhelpdata/%s", abs_srcdir, info->name) < 0)
         return -1;
 
-    if (virtTestLoadFile(path, &help) < 0)
+    if (virTestLoadFile(path, &help) < 0)
         goto cleanup;
 
     if (!(flags = virQEMUCapsNew()))
@@ -76,7 +76,7 @@ static int testHelpStrParsing(const void *data)
                     info->name) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(path, &help) < 0)
+    if (virTestLoadFile(path, &help) < 0)
         goto cleanup;
 
     if (virQEMUCapsParseDeviceStr(flags, help) < 0)
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 3961328..68279d0 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -233,12 +233,12 @@ testQemuHotplug(const void *data)
                     test->device_filename) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(domain_filename, &domain_xml) < 0 ||
-        virtTestLoadFile(device_filename, &device_xml) < 0)
+    if (virTestLoadFile(domain_filename, &domain_xml) < 0 ||
+        virTestLoadFile(device_filename, &device_xml) < 0)
         goto cleanup;
 
     if (test->action != UPDATE &&
-        virtTestLoadFile(result_filename, &result_xml) < 0)
+        virTestLoadFile(result_filename, &result_xml) < 0)
         goto cleanup;
 
     if (!(caps = virQEMUDriverGetCapabilities(&driver, false)))
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 7d56941..e929cb2 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2159,7 +2159,7 @@ testQemuMonitorJSONGetCPUData(const void *opaque)
                     abs_srcdir, data->name) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(jsonFile, &jsonStr) < 0)
+    if (virTestLoadFile(jsonFile, &jsonStr) < 0)
         goto cleanup;
 
     if (qemuMonitorTestAddItem(test, "qom-list",
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cb7eefa..1cfbe1a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -194,7 +194,7 @@ fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool,
                     pool->name) < 0)
         return NULL;
 
-    if (virtTestLoadFile(xmlpath, &xmlbuf) < 0) {
+    if (virTestLoadFile(xmlpath, &xmlbuf) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "failed to load XML file '%s'",
                        xmlpath);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5f3a0b3..7b01587 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -109,9 +109,9 @@ testCompareStatusXMLToXMLFiles(const void *opaque)
     int ret = -1;
     int keepBlanksDefault = xmlKeepBlanksDefault(0);
 
-    if (virtTestLoadFile(data->inName, &inFile) < 0)
+    if (virTestLoadFile(data->inName, &inFile) < 0)
         goto cleanup;
-    if (virtTestLoadFile(data->outActiveName, &outActiveFile) < 0)
+    if (virTestLoadFile(data->outActiveName, &outActiveFile) < 0)
         goto cleanup;
 
     /* construct faked source status XML */
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index a488c60..e3698fb 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -36,7 +36,7 @@ testCompareFiles(const char *xml, const char *sexpr)
   conn = virGetConnect();
   if (!conn) goto fail;
 
-  if (virtTestLoadFile(sexpr, &sexprData) < 0)
+  if (virTestLoadFile(sexpr, &sexprData) < 0)
       goto fail;
 
   memset(&priv, 0, sizeof(priv));
diff --git a/tests/testutils.c b/tests/testutils.c
index 06149762..1b081a5 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -294,7 +294,7 @@ virTestRun(const char *title,
    Upon any failure, diagnose it and return -1, but don't bother trying
    to preserve errno. Otherwise, return the number of bytes copied into BUF. */
 int
-virtTestLoadFile(const char *file, char **buf)
+virTestLoadFile(const char *file, char **buf)
 {
     FILE *fp = fopen(file, "r");
     struct stat st;
@@ -693,7 +693,7 @@ virtTestCompareToFile(const char *strcontent,
     char *filecontent = NULL;
     char *fixedcontent = NULL;
 
-    if (virtTestLoadFile(filename, &filecontent) < 0 && !virTestGetRegenerate())
+    if (virTestLoadFile(filename, &filecontent) < 0 && !virTestGetRegenerate())
         goto failure;
 
     if (filecontent &&
diff --git a/tests/testutils.h b/tests/testutils.h
index dd48a87..1a094b3 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -51,7 +51,7 @@ bool virtTestOOMActive(void);
 int virTestRun(const char *title,
                 int (*body)(const void *data),
                 const void *data);
-int virtTestLoadFile(const char *file, char **buf);
+int virTestLoadFile(const char *file, char **buf);
 int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
 
 void virtTestClearCommandPath(char *cmdset);
diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
index 2ccfa73..1bbfb81 100644
--- a/tests/vboxsnapshotxmltest.c
+++ b/tests/vboxsnapshotxmltest.c
@@ -67,7 +67,7 @@ testCompareXMLtoXMLFiles(const char *xml)
     if (virFileMakePath(abs_builddir "/vboxsnapshotxmldata") < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(xml, &xmlData) < 0)
+    if (virTestLoadFile(xml, &xmlData) < 0)
         goto cleanup;
 
     if (!(machine = virVBoxSnapshotConfLoadVboxFile(xml, (char*)"")))
@@ -76,7 +76,7 @@ testCompareXMLtoXMLFiles(const char *xml)
     if (virVBoxSnapshotConfSaveVboxFile(machine, pathResult) < 0)
         goto cleanup;
 
-    if (virtTestLoadFile(pathResult, &actual) < 0)
+    if (virTestLoadFile(pathResult, &actual) < 0)
         goto cleanup;
 
     if (!(actual = testFilterXML(actual)))
diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c
index e41231d..2768f43 100644
--- a/tests/vmwarevertest.c
+++ b/tests/vmwarevertest.c
@@ -49,7 +49,7 @@ testVerStrParse(const void *data)
                     info->name) < 0)
         return -1;
 
-    if (virtTestLoadFile(path, &databuf) < 0)
+    if (virTestLoadFile(path, &databuf) < 0)
         goto cleanup;
 
     if ((vmware_type = vmwareDriverTypeFromString(info->vmware_type)) < 0)
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index b5557b2..e45f153 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -75,7 +75,7 @@ testCompareFiles(const char *vmx, const char *xml)
     char *formatted = NULL;
     virDomainDefPtr def = NULL;
 
-    if (virtTestLoadFile(vmx, &vmxData) < 0)
+    if (virTestLoadFile(vmx, &vmxData) < 0)
         goto cleanup;
 
     if (!(def = virVMXParseConfig(&ctx, xmlopt, caps, vmxData)))
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index e9c583c..95d47c4 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -111,7 +111,7 @@ testCompareFormatXML(const char *xlcfg, const char *xml)
     conn = virGetConnect();
     if (!conn) goto fail;
 
-    if (virtTestLoadFile(xlcfg, &xlcfgData) < 0)
+    if (virTestLoadFile(xlcfg, &xlcfgData) < 0)
         goto fail;
 
     if (!(conf = virConfReadMem(xlcfgData, strlen(xlcfgData), 0)))
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index d01191c..d4b6b87 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -108,7 +108,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
     conn = virGetConnect();
     if (!conn) goto fail;
 
-    if (virtTestLoadFile(xmcfg, &xmcfgData) < 0)
+    if (virTestLoadFile(xmcfg, &xmcfgData) < 0)
         goto fail;
 
     /* Many puppies died to bring you this code. */
-- 
2.5.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]