shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

testQemuAgentSSHKeys: Refactor cleanup

Browse Source 
Use automatic memory freeing for the 'qemuMonitorTest' object and the
list of keys so that the cleanup section can be removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-14 13:51:17 +02:00
parent d40e9d1df8
commit 7f58028c2b
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tests/qemuagenttest.c
View File

@ -39,16 +39,15 @@ static int
testQemuAgentSSHKeys(const void *data)
{
virDomainXMLOption *xmlopt = (virDomainXMLOption *)data;
qemuMonitorTest *test = qemuMonitorTestNewAgent(xmlopt);
char **keys = NULL;
g_autoptr(qemuMonitorTest) test = qemuMonitorTestNewAgent(xmlopt);
g_auto(GStrv) keys = NULL;
int nkeys = 0;
int ret = -1;
if (!test)
return -1;
if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
goto cleanup;
return -1;
if (qemuMonitorTestAddItem(test, "guest-ssh-get-authorized-keys",
"{\"return\": {"
@ -57,59 +56,52 @@ testQemuAgentSSHKeys(const void *data)
" \"algo2 key2 comments2\""
" ]"
"}}") < 0)
goto cleanup;
return -1;
if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
goto cleanup;
return -1;
if (qemuMonitorTestAddItem(test, "guest-ssh-add-authorized-keys",
"{ \"return\" : {} }") < 0)
goto cleanup;
return -1;
if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
goto cleanup;
return -1;
if (qemuMonitorTestAddItem(test, "guest-ssh-remove-authorized-keys",
"{ \"return\" : {} }") < 0)
goto cleanup;
return -1;
if ((nkeys = qemuAgentSSHGetAuthorizedKeys(qemuMonitorTestGetAgent(test),
"user",
&keys)) < 0)
goto cleanup;
return -1;
if (nkeys != 2) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"expected 2 keys, got %d", nkeys);
ret = -1;
goto cleanup;
return -1;
}
if (STRNEQ(keys[1], "algo2 key2 comments2")) {
virReportError(VIR_ERR_INTERNAL_ERROR, "Unexpected key returned: %s", keys[1]);
ret = -1;
goto cleanup;
return -1;
}
if ((ret = qemuAgentSSHAddAuthorizedKeys(qemuMonitorTestGetAgent(test),
"user",
(const char **) keys,
nkeys,
true)) < 0)
goto cleanup;
if (qemuAgentSSHAddAuthorizedKeys(qemuMonitorTestGetAgent(test),
"user",
(const char **) keys,
nkeys,
true) < 0)
return -1;
if ((ret = qemuAgentSSHRemoveAuthorizedKeys(qemuMonitorTestGetAgent(test),
"user",
(const char **) keys,
nkeys)) < 0)
goto cleanup;
if (qemuAgentSSHRemoveAuthorizedKeys(qemuMonitorTestGetAgent(test),
"user",
(const char **) keys,
nkeys) < 0)
return -1;
ret = 0;
cleanup:
virStringListFreeCount(keys, nkeys);
qemuMonitorTestFree(test);
return ret;
return 0;
}