From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 9 Sep 2016 00:05:39 +0000 (+0300)
Subject: lib-test: test_expect_errors() now works for the entire log string, not just format... 
X-Git-Tag: 2.2.26~287
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd30f04db41a2d610ff2a88945249a3c5c958a73;p=thirdparty%2Fdovecot%2Fcore.git

lib-test: test_expect_errors() now works for the entire log string, not just format parameter
---

diff --git a/src/lib-test/test-common.c b/src/lib-test/test-common.c
index 6a10170a6f..1ab4b9b536 100644
--- a/src/lib-test/test-common.c
+++ b/src/lib-test/test-common.c
@@ -306,12 +306,15 @@ test_error_handler(const struct failure_context *ctx,
 	}
 #endif
 	if (expected_errors > 0) {
-		if (expected_error_str != NULL) {
+		if (expected_error_str != NULL) T_BEGIN {
 			/* test_assert() will reset test_success if need be. */
-			suppress = strstr(format, expected_error_str) != NULL;
+			va_list args2;
+			VA_COPY(args2, args);
+			const char *str = t_strdup_vprintf(format, args2);
+			suppress = strstr(str, expected_error_str) != NULL;
 			test_assert(suppress == TRUE);
 			i_free_and_null(expected_error_str);
-		}
+		} T_END;
 		expected_errors--;
 	} else {
 		test_success = FALSE;