From a9a476e3fb26e96dc2ef1da2feacee2b56a00bdb Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 14 Aug 2018 10:30:48 -0400 Subject: [PATCH] test: Don't overwrite virAuthGet{Username|Password} errors Now that the virAuthGet*Path API's generate all the error messages we can remove them from the callers. Signed-off-by: John Ferlan Reviewed-by: Marcos Paulo de Souza --- src/test/test_driver.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index dfca95c981..6697a7dfe6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1374,12 +1374,9 @@ testConnectAuthenticate(virConnectPtr conn, /* Authentication is required because the test XML contains a * non-empty section. First we must ask for a username. */ - username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/); - if (!username) { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed when asking for username")); + if (!(username = virAuthGetUsername(conn, auth, "test", NULL, + "localhost"/*?*/))) goto cleanup; - } /* Does the username exist? */ for (i = 0; i < privconn->numAuths; ++i) { @@ -1391,13 +1388,9 @@ testConnectAuthenticate(virConnectPtr conn, found_user: /* Even if we didn't find the user, we still ask for a password. */ if (i == -1 || privconn->auths[i].password != NULL) { - password = virAuthGetPassword(conn, auth, "test", - username, "localhost"); - if (password == NULL) { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed when asking for password")); + if (!(password = virAuthGetPassword(conn, auth, "test", username, + "localhost"))) goto cleanup; - } } if (i == -1 || -- 2.47.2