External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemublocktest: testBackingXMLjsonXML: Drop 'legacy' mode

Browse Source 
Legacy mode used to be needed for use with -drive, which was almost
completely deleted. We now have qemuxml2argvtest test cases checking a
few cases and the rest uses the modern mode only. Thus we don't need to
test the legacy mode any more.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-10-18 16:55:13 +02:00
parent 35815b1e75
commit 197fc3723f
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/qemublocktest.c
View File

@ -61,8 +61,6 @@ testBackingXMLjsonXML(const void *args)
g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
unsigned int backendpropsflags = QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_TARGET_ONLY; unsigned int backendpropsflags = QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_TARGET_ONLY;
if (data->legacy)
backendpropsflags |= QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_LEGACY;
xmlsrc = virStorageSourceNew(); xmlsrc = virStorageSourceNew();
xmlsrc->type = data->type; xmlsrc->type = data->type;
@ -81,17 +79,15 @@ testBackingXMLjsonXML(const void *args)
return -1; return -1;
} }
if (!data->legacy) { if (testQEMUSchemaValidate(backendprops, data->schemaroot,
if (testQEMUSchemaValidate(backendprops, data->schemaroot, data->schema, false, &debug) < 0) {
data->schema, false, &debug) < 0) { g_autofree char *debugmsg = virBufferContentAndReset(&debug);
g_autofree char *debugmsg = virBufferContentAndReset(&debug); g_autofree char *debugprops = virJSONValueToString(backendprops, true);
g_autofree char *debugprops = virJSONValueToString(backendprops, true);
VIR_TEST_VERBOSE("json does not conform to QAPI schema"); VIR_TEST_VERBOSE("json does not conform to QAPI schema");
VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s", VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
debugprops, NULLSTR(debugmsg)); debugprops, NULLSTR(debugmsg));
return -1; return -1;
}
} }
if (virJSONValueObjectAdd(&wrapper, "a:file", &backendprops, NULL) < 0) if (virJSONValueObjectAdd(&wrapper, "a:file", &backendprops, NULL) < 0)
@ -1012,11 +1008,6 @@ mymain(void)
do { \ do { \
xmljsonxmldata.type = tpe; \ xmljsonxmldata.type = tpe; \
xmljsonxmldata.xml = xmlstr; \ xmljsonxmldata.xml = xmlstr; \
xmljsonxmldata.legacy = true; \
if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, \
&xmljsonxmldata) < 0) \
ret = -1; \
xmljsonxmldata.legacy = false; \
if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, \ if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, \
&xmljsonxmldata) < 0) \ &xmljsonxmldata) < 0) \
ret = -1; \ ret = -1; \