External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

testQemuDiskXMLToPropsValidateFileSrcOnly: Move together with rest of xml->json code

Browse Source 
The function was misplaced. Group it together with other helper
functions for testing disk XML to qemu JSON props conversion.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-23 11:50:57 +01:00
parent 4a9f355535
commit fed97cb435
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/qemublocktest.c
View File

@ -387,6 +387,37 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque)
} }
static int
testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque)
{
struct testQemuDiskXMLToJSONData *data = (void *) opaque;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *jsonpath = NULL;
g_autofree char *actual = NULL;
size_t i;
if (data->fail)
return EXIT_AM_SKIP;
jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath,
data->name);
for (i = 0; i < data->npropssrc; i++) {
g_autofree char *jsonstr = NULL;
if (!(jsonstr = virJSONValueToString(data->propssrc[i], true)))
return -1;
virBufferAdd(&buf, jsonstr, -1);
}
actual = virBufferContentAndReset(&buf);
return virTestCompareToFile(actual, jsonpath);
}
struct testQemuImageCreateData { struct testQemuImageCreateData {
const char *name; const char *name;
const char *backingname; const char *backingname;
@ -515,36 +546,6 @@ testQemuImageCreate(const void *opaque)
} }
static int
testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque)
{
struct testQemuDiskXMLToJSONData *data = (void *) opaque;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *jsonpath = NULL;
g_autofree char *actual = NULL;
size_t i;
if (data->fail)
return EXIT_AM_SKIP;
jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath,
data->name);
for (i = 0; i < data->npropssrc; i++) {
g_autofree char *jsonstr = NULL;
if (!(jsonstr = virJSONValueToString(data->propssrc[i], true)))
return -1;
virBufferAdd(&buf, jsonstr, -1);
}
actual = virBufferContentAndReset(&buf);
return virTestCompareToFile(actual, jsonpath);
}
static const char *bitmapDetectPrefix = "qemublocktestdata/bitmap/"; static const char *bitmapDetectPrefix = "qemublocktestdata/bitmap/";
static void static void