shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

tests: Rename virtTestClearCommandPath to virTestClearCommandPath.

Browse Source 
This function doesn't follow our convention of naming functions.
This commit is contained in:
Tomáš Ryšavý 2016-05-26 17:01:55 +02:00 committed by John Ferlan
parent 753edcb3a4
commit 8a9bd034c2
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/networkxml2firewalltest.c
View File

@ -65,7 +65,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto cleanup; goto cleanup;
actualargv = virBufferContentAndReset(&buf); actualargv = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actualargv); virTestClearCommandPath(actualargv);
virCommandSetDryRun(NULL, NULL, NULL); virCommandSetDryRun(NULL, NULL, NULL);
if (virTestCompareToFile(actualargv, cmdline) < 0) if (virTestCompareToFile(actualargv, cmdline) < 0)

14
tests/nwfilterebiptablestest.c
View File

@ -113,7 +113,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
@ -184,7 +184,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
@ -233,7 +233,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
@ -267,7 +267,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
@ -339,7 +339,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
@ -429,7 +429,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
@ -502,7 +502,7 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup; goto cleanup;
actual = virBufferContentAndReset(&buf); actual = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actual); virTestClearCommandPath(actual);
if (STRNEQ_NULLABLE(actual, expected)) { if (STRNEQ_NULLABLE(actual, expected)) {
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);

2
tests/nwfilterxml2firewalltest.c
View File

@ -400,7 +400,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto cleanup; goto cleanup;
actualargv = virBufferContentAndReset(&buf); actualargv = virBufferContentAndReset(&buf);
virtTestClearCommandPath(actualargv); virTestClearCommandPath(actualargv);
virCommandSetDryRun(NULL, NULL, NULL); virCommandSetDryRun(NULL, NULL, NULL);
testRemoveCommonRules(actualargv); testRemoveCommonRules(actualargv);

2
tests/testutils.c
View File

@ -1008,7 +1008,7 @@ int virtTestMain(int argc,
* iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT * iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT
* iptables --table filter --insert FORWARD --in-interface virbr0 --out-interface virbr0 --jump ACCEPT" * 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; size_t offset = 0;
char *lineStart = cmdset; char *lineStart = cmdset;

2
tests/testutils.h
View File

@ -54,7 +54,7 @@ int virTestRun(const char *title,
int virTestLoadFile(const char *file, char **buf); int virTestLoadFile(const char *file, char **buf);
int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen); int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
void virtTestClearCommandPath(char *cmdset); void virTestClearCommandPath(char *cmdset);
int virTestDifference(FILE *stream, int virTestDifference(FILE *stream,
const char *expect, const char *expect,