openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemumonitorjsontest: chardev: Remove need to allow unused commands 

Don't add the command to the test monitor when we don't expect to invoke
it rather than bypassing the test monitor.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-08 16:11:06 +01:00
parent 22d5ce0252
commit e6f837f611
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/qemumonitorjsontest.c
View File

@ -659,9 +659,8 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOption *xmlopt,
fulllabel = g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", label);
qemuMonitorTestAllowUnusedCommands(test);
if (qemuMonitorTestAddItemExpect(test, "chardev-add",
if (expectargs &&
qemuMonitorTestAddItemExpect(test, "chardev-add",
expectargs, true, jsonreply) < 0)
return -1;
@ -784,10 +783,10 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOption *xmlopt,
"data':{'type':'vdagent'}}}");
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_PIPE };
CHECK("pipe", true, "");
CHECK("pipe", true, NULL);
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_STDIO };
CHECK("stdio", true, "");
CHECK("stdio", true, NULL);
#undef CHECK
return ret;