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

[libvirt] [PATCH v2 06/19] tests: Rename virtTestClearCommandPath to virTestClearCommandPath.



This function doesn't follow our convention of naming functions.
---
 tests/networkxml2firewalltest.c  |  2 +-
 tests/nwfilterebiptablestest.c   | 14 +++++++-------
 tests/nwfilterxml2firewalltest.c |  2 +-
 tests/testutils.c                |  2 +-
 tests/testutils.h                |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index baf5904..f3a501a 100644
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -65,7 +65,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
         goto cleanup;
 
     actualargv = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actualargv);
+    virTestClearCommandPath(actualargv);
     virCommandSetDryRun(NULL, NULL, NULL);
 
     if (virTestCompareToFile(actualargv, cmdline) < 0)
diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c
index 84e5ed2..74f9ebd 100644
--- a/tests/nwfilterebiptablestest.c
+++ b/tests/nwfilterebiptablestest.c
@@ -113,7 +113,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
@@ -184,7 +184,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
@@ -233,7 +233,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
@@ -267,7 +267,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
@@ -339,7 +339,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
@@ -429,7 +429,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
@@ -502,7 +502,7 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     actual = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actual);
+    virTestClearCommandPath(actual);
 
     if (STRNEQ_NULLABLE(actual, expected)) {
         virTestDifference(stderr, expected, actual);
diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index 205d3b6..ba327d0 100644
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -400,7 +400,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
         goto cleanup;
 
     actualargv = virBufferContentAndReset(&buf);
-    virtTestClearCommandPath(actualargv);
+    virTestClearCommandPath(actualargv);
     virCommandSetDryRun(NULL, NULL, NULL);
 
     testRemoveCommonRules(actualargv);
diff --git a/tests/testutils.c b/tests/testutils.c
index 0e9ade7..54e1659 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -1008,7 +1008,7 @@ int virtTestMain(int argc,
  *  iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT
  *  iptables --table filter --insert FORWARD --in-interface virbr0 --out-interface virbr0 --jump ACCEPT"
  */
-void virtTestClearCommandPath(char *cmdset)
+void virTestClearCommandPath(char *cmdset)
 {
     size_t offset = 0;
     char *lineStart = cmdset;
diff --git a/tests/testutils.h b/tests/testutils.h
index d9f92b5..77a5d25 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -54,7 +54,7 @@ int virTestRun(const char *title,
 int virTestLoadFile(const char *file, char **buf);
 int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
 
-void virtTestClearCommandPath(char *cmdset);
+void virTestClearCommandPath(char *cmdset);
 
 int virTestDifference(FILE *stream,
                       const char *expect,
-- 
2.5.5


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