>From f051b6370913c5bb5f7fe2a1b895ad7dda04dda4 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 20 Jun 2014 21:34:13 +0200 Subject: [PATCH 1/3] TESTS: Fix format string in check macros --- src/tests/fail_over-tests.c | 2 +- src/tests/files-tests.c | 2 +- src/tests/ipa_hbac-tests.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/fail_over-tests.c b/src/tests/fail_over-tests.c index c00025960f9ee593eb7f33a1bb13df056a702816..78aaf9c10d833b04e4feacfc5bef3691abe76d2d 100644 --- a/src/tests/fail_over-tests.c +++ b/src/tests/fail_over-tests.c @@ -172,7 +172,7 @@ test_resolve_service_callback(struct tevent_req *req) if (fo_get_server_name(server) != NULL) { he = fo_get_server_hostent(server); - fail_if(he == NULL, "%s: fo_get_server_hostent() returned NULL"); + fail_if(he == NULL, "fo_get_server_hostent() returned NULL"); for (i = 0; he->addr_list[i]; i++) { char buf[256]; diff --git a/src/tests/files-tests.c b/src/tests/files-tests.c index 8b649e77f749e98d8f707671047c93eea8b16afb..e8bd3b97d21bea2170049bbab5faedb88cf87966 100644 --- a/src/tests/files-tests.c +++ b/src/tests/files-tests.c @@ -193,7 +193,7 @@ START_TEST(test_simple_copy) tmp = talloc_asprintf(test_ctx, "%s/bar", dst_path); ret = check_and_open_readonly(tmp, &fd, uid, gid, S_IFREG|S_IRWXU, 0); - fail_unless(ret == EOK, "Cannot open %s\n"); + fail_unless(ret == EOK, "Cannot open %s\n", tmp); close(fd); talloc_free(tmp); } diff --git a/src/tests/ipa_hbac-tests.c b/src/tests/ipa_hbac-tests.c index a1dd2fa411dc1ce8bd53bbe1c1283dce86c477db..2e9cbf54532f0aa84da5432032a2b72434221826 100644 --- a/src/tests/ipa_hbac-tests.c +++ b/src/tests/ipa_hbac-tests.c @@ -704,7 +704,7 @@ START_TEST(ipa_hbac_test_allow_srchost) result = hbac_evaluate(rules, eval_req, &info); fail_unless(result == HBAC_EVAL_DENY, "Expected [%s], got [%s]; " - "Error: [%s](%s)", + "Error: [%s]", hbac_result_string(HBAC_EVAL_DENY), hbac_result_string(result), info ? hbac_error_string(info->code):"Unknown"); -- 1.9.3