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

diff --git a/src/lib-test/test-common.c b/src/lib-test/test-common.c
index b026492d5215d8d93c8510e797d5a0da74fc4ea7..4b60c5012f78746862bed365d4617a54095e8e67 100644 (file)
--- a/src/lib-test/test-common.c
+++ b/src/lib-test/test-common.c
@@ -298,12 +298,15 @@ test_error_handler(const struct failure_context *ctx,
        bool suppress = FALSE;
 
        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;