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

testQemuMonitorJSONAttachChardev: Move all setup code under virTestRun

Browse Source 
Any failure which happens outside is hard to debug as errors will be
reset and not raised.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-05-22 16:18:40 +02:00
parent 594fe5f882
commit 9482098395
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tests/qemumonitorjsontest.c
View File

@ -596,19 +596,35 @@ testQemuMonitorJSONGetTPMModels(const void *opaque)
struct qemuMonitorJSONTestAttachChardevData {
qemuMonitorTest *test;
virDomainChrSourceDef *chr;
const char *expectPty;
bool fail;
virDomainXMLOption *xmlopt;
GHashTable *schema;
const char *expectargs;
const char *reply;
};
static int
testQemuMonitorJSONAttachChardev(const void *opaque)
{
const struct qemuMonitorJSONTestAttachChardevData *data = opaque;
g_autoptr(qemuMonitorTest) test = qemuMonitorTestNewSchema(data->xmlopt, data->schema);
int rc;
if ((rc = qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(data->test),
if (!test)
return -1;
if (data->expectargs) {
g_autofree char *jsonreply = g_strdup_printf("{\"return\": {%s}}", NULLSTR_EMPTY(data->reply));
if (qemuMonitorTestAddItemExpect(test, "chardev-add",
data->expectargs, true, jsonreply) < 0)
return -1;
}
if ((rc = qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(test),
"alias", data->chr)) < 0)
goto cleanup;
@ -643,37 +659,19 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOption *xmlopt,
bool fail)
{
struct qemuMonitorJSONTestAttachChardevData data = {0};
g_autoptr(qemuMonitorTest) test = qemuMonitorTestNewSchema(xmlopt, schema);
g_autofree char *jsonreply = NULL;
g_autofree char *fulllabel = NULL;
struct qemuMonitorJSONTestAttachChardevData data = { .chr = chr,
.fail = fail,
.expectPty = expectPty,
.expectargs = expectargs,
.reply = reply,
.xmlopt = xmlopt,
.schema = schema };
g_autofree char *fulllabel = g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", label);
if (!test)
return -1;
if (!reply)
reply = "";
jsonreply = g_strdup_printf("{\"return\": {%s}}", reply);
fulllabel = g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", label);
if (expectargs &&
qemuMonitorTestAddItemExpect(test, "chardev-add",
expectargs, true, jsonreply) < 0)
return -1;
data.chr = chr;
data.fail = fail;
data.expectPty = expectPty;
data.test = test;
if (virTestRun(fulllabel, &testQemuMonitorJSONAttachChardev, &data) < 0)
return -1;
return 0;
return virTestRun(fulllabel, &testQemuMonitorJSONAttachChardev, &data);
}
static int
qemuMonitorJSONTestAttachChardev(virDomainXMLOption *xmlopt,
GHashTable *schema)