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

tests: assume JSON monitor in qemuMonitorTestNewSimple

Browse Source 
The only user of the qemuMonitorTestNewSimple macro is using JSON.
Always pass 'true' to qemuMonitorTestNew and remove the 'json'
argument.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2019-06-14 20:10:15 +02:00
parent 0c1e035085
commit 92f130a2e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemumonitortestutils.c
View File

@ -1318,7 +1318,7 @@ qemuMonitorTestNewFromFile(const char *fileName,
if (virTestLoadFile(fileName, &json) < 0) if (virTestLoadFile(fileName, &json) < 0)
goto cleanup; goto cleanup;
if (simple && !(test = qemuMonitorTestNewSimple(true, xmlopt))) if (simple && !(test = qemuMonitorTestNewSimple(xmlopt)))
goto cleanup; goto cleanup;
/* Our JSON parser expects replies to be separated by a newline character. /* Our JSON parser expects replies to be separated by a newline character.

4
tests/qemumonitortestutils.h
View File

@ -74,8 +74,8 @@ int qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test,
bool apostrophe, bool apostrophe,
const char *response); const char *response);
# define qemuMonitorTestNewSimple(json, xmlopt) \ # define qemuMonitorTestNewSimple(xmlopt) \
qemuMonitorTestNew(json, xmlopt, NULL, NULL, NULL, NULL) qemuMonitorTestNew(true, xmlopt, NULL, NULL, NULL, NULL)
# define qemuMonitorTestNewSchema(xmlopt, schema) \ # define qemuMonitorTestNewSchema(xmlopt, schema) \
qemuMonitorTestNew(true, xmlopt, NULL, NULL, NULL, schema) qemuMonitorTestNew(true, xmlopt, NULL, NULL, NULL, schema)