NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove test 'args' file rewrapping infrastructure

Browse Source 
All tests which use files with 'ldargs' and 'args' suffix as output now
use the internal and better line splitting.

Remove the test-wrap-argv.py script, the syntax check which used it and
the helper rewrapping the output when regenerating test output.

For any further use, we require code to use virCommand anyways and thus
it has internal wrapping now.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa
2021-04-06 16:49:47 +02:00
parent d146b193e2
commit 76d722d3d5
4 changed files with 5 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/testutils.c
View File

@@ -325,26 +325,6 @@ virTestLoadFileJSON(const char *p, ...)
}
static int
virTestRewrapFile(const char *filename)
{
g_autofree char *script = NULL;
g_autoptr(virCommand) cmd = NULL;
if (!(virStringHasSuffix(filename, ".args") ||
virStringHasSuffix(filename, ".argv") ||
virStringHasSuffix(filename, ".ldargs")))
return 0;
script = g_strdup_printf("%s/scripts/test-wrap-argv.py", abs_top_srcdir);
cmd = virCommandNewArgList(PYTHON3, script, "--in-place", filename, NULL);
if (virCommandRun(cmd, NULL) < 0)
return -1;
return 0;
}
/**
* @param stream: output stream to write differences to
* @param expect: expected output text
@@ -364,8 +344,7 @@ virTestDifferenceFullInternal(FILE *stream,
const char *expectName,
const char *actual,
const char *actualName,
bool regenerate,
bool rewrap)
bool regenerate)
{
const char *expectStart;
const char *expectEnd;
@@ -387,12 +366,6 @@ virTestDifferenceFullInternal(FILE *stream,
virDispatchError(NULL);
return -1;
}
if (rewrap &&
virTestRewrapFile(expectName) < 0) {
virDispatchError(NULL);
return -1;
}
}
if (!virTestGetDebug())
@@ -457,7 +430,7 @@ virTestDifferenceFull(FILE *stream,
const char *actualName)
{
return virTestDifferenceFullInternal(stream, expect, expectName,
actual, actualName, true, true);
actual, actualName, true);
}
/**
@@ -480,7 +453,7 @@ virTestDifferenceFullNoRegenerate(FILE *stream,
const char *actualName)
{
return virTestDifferenceFullInternal(stream, expect, expectName,
actual, actualName, false, false);
actual, actualName, false);
}
/**
@@ -607,7 +580,7 @@ virTestCompareToFileFull(const char *actual,
if (STRNEQ_NULLABLE(cmpcontent, filecontent)) {
virTestDifferenceFullInternal(stderr, filecontent, filename,
cmpcontent, NULL, true, unwrap);
cmpcontent, NULL, true);
return -1;
}