tests: uri: Use VIR_TEST_DEBUG instead of VIR_DEBUG

VIR_TEST_DEBUG can be easily made verbose in the tests.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-05-30 11:30:32 +02:00
parent b872422a9c
commit cd99bcf298

View File

@ -56,60 +56,60 @@ static int testURIParse(const void *args)
goto cleanup; goto cleanup;
if (STRNEQ(uri->scheme, data->scheme)) { if (STRNEQ(uri->scheme, data->scheme)) {
VIR_DEBUG("Expected scheme '%s', actual '%s'", VIR_TEST_DEBUG("Expected scheme '%s', actual '%s'",
data->scheme, uri->scheme); data->scheme, uri->scheme);
goto cleanup; goto cleanup;
} }
if (STRNEQ(uri->server, data->server)) { if (STRNEQ(uri->server, data->server)) {
VIR_DEBUG("Expected server '%s', actual '%s'", VIR_TEST_DEBUG("Expected server '%s', actual '%s'",
data->server, uri->server); data->server, uri->server);
goto cleanup; goto cleanup;
} }
if (uri->port != data->port) { if (uri->port != data->port) {
VIR_DEBUG("Expected port '%d', actual '%d'", VIR_TEST_DEBUG("Expected port '%d', actual '%d'",
data->port, uri->port); data->port, uri->port);
goto cleanup; goto cleanup;
} }
if (STRNEQ_NULLABLE(uri->path, data->path)) { if (STRNEQ_NULLABLE(uri->path, data->path)) {
VIR_DEBUG("Expected path '%s', actual '%s'", VIR_TEST_DEBUG("Expected path '%s', actual '%s'",
data->path, uri->path); data->path, uri->path);
goto cleanup; goto cleanup;
} }
if (STRNEQ_NULLABLE(uri->query, data->query)) { if (STRNEQ_NULLABLE(uri->query, data->query)) {
VIR_DEBUG("Expected query '%s', actual '%s'", VIR_TEST_DEBUG("Expected query '%s', actual '%s'",
data->query, uri->query); data->query, uri->query);
goto cleanup; goto cleanup;
} }
if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) { if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) {
VIR_DEBUG("Expected fragment '%s', actual '%s'", VIR_TEST_DEBUG("Expected fragment '%s', actual '%s'",
data->fragment, uri->fragment); data->fragment, uri->fragment);
goto cleanup; goto cleanup;
} }
for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) { for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) {
if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) { if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) {
VIR_DEBUG("Expected param name %zu '%s', actual '%s'", VIR_TEST_DEBUG("Expected param name %zu '%s', actual '%s'",
i, data->params[i].name, uri->params[i].name); i, data->params[i].name, uri->params[i].name);
goto cleanup; goto cleanup;
} }
if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) { if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) {
VIR_DEBUG("Expected param value %zu '%s', actual '%s'", VIR_TEST_DEBUG("Expected param value %zu '%s', actual '%s'",
i, data->params[i].value, uri->params[i].value); i, data->params[i].value, uri->params[i].value);
goto cleanup; goto cleanup;
} }
} }
if (data->params && data->params[i].name) { if (data->params && data->params[i].name) {
VIR_DEBUG("Missing parameter %zu %s=%s", VIR_TEST_DEBUG("Missing parameter %zu %s=%s",
i, data->params[i].name, data->params[i].value); i, data->params[i].name, data->params[i].value);
goto cleanup; goto cleanup;
} }
if (i != uri->paramsCount) { if (i != uri->paramsCount) {
VIR_DEBUG("Unexpected parameter %zu %s=%s", VIR_TEST_DEBUG("Unexpected parameter %zu %s=%s",
i, uri->params[i].name, uri->params[i].value); i, uri->params[i].name, uri->params[i].value);
goto cleanup; goto cleanup;
} }
@ -121,7 +121,7 @@ static int testURIParse(const void *args)
goto cleanup; goto cleanup;
if (STRNEQ(uristr, data->uri_out)) { if (STRNEQ(uristr, data->uri_out)) {
VIR_DEBUG("URI did not roundtrip, expect '%s', actual '%s'", VIR_TEST_DEBUG("URI did not roundtrip, expect '%s', actual '%s'",
data->uri_out, uristr); data->uri_out, uristr);
goto cleanup; goto cleanup;
} }