External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemumonitorjson: Do some useful testing in the 'simple' tests

Browse Source 
The 'simple' monitor tests were quite useless, since the code did not
even check whether the correct command was called.

This patch uses the QAPI schema validator to validate that the arguments
are in format according to the schema.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-03-22 19:07:21 +01:00
parent 5a96b8d775
commit b949b39476
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/qemumonitorjsontest.c
View File

@ -42,6 +42,7 @@ struct _testQemuMonitorJSONSimpleFuncData {
int (* func) (qemuMonitorPtr mon);
virDomainXMLOptionPtr xmlopt;
const char *reply;
virHashTablePtr schema;
};
const char *queryBlockReply =
@ -1266,7 +1267,7 @@ testQemuMonitorJSONSimpleFunc(const void *opaque)
testQemuMonitorJSONSimpleFuncDataPtr data =
(testQemuMonitorJSONSimpleFuncDataPtr) opaque;
virDomainXMLOptionPtr xmlopt = data->xmlopt;
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema);
const char *reply = data->reply;
int ret = -1;
@ -2896,6 +2897,13 @@ mymain(void)
virEventRegisterDefaultImpl();
if (!(qapiData.schema = testQEMUSchemaLoad())) {
VIR_TEST_VERBOSE("failed to load qapi schema\n");
ret = -1;
goto cleanup;
}
simpleFunc.schema = qapiData.schema;
#define DO_TEST(name) \
if (virTestRun(# name, testQemuMonitorJSON ## name, driver.xmlopt) < 0) \
ret = -1
@ -3042,11 +3050,6 @@ mymain(void)
ret = -1; \
} while (0)
if (!(qapiData.schema = testQEMUSchemaLoad())) {
VIR_TEST_VERBOSE("failed to load qapi schema\n");
ret = -1;
goto cleanup;
}
DO_TEST_QAPI_SCHEMA("string", "trace-event-get-state/arg-type", true,
"{\"name\":\"test\"}");