From ec2d11e9a01b1c14ebc2bbf69f13a55bebcfe248 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 19 Sep 2018 12:41:39 +0300 Subject: [PATCH] global: Don't try to send stats from unit tests --- src/director/director-test.c | 4 +++- src/lib-smtp/test-smtp-submit.c | 7 +++++-- src/lib-storage/test-mail-storage.c | 1 + src/plugins/mail-crypt/test-mail-key.c | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/director/director-test.c b/src/director/director-test.c index f8cf9e7cee..e23ac49fb2 100644 --- a/src/director/director-test.c +++ b/src/director/director-test.c @@ -581,9 +581,11 @@ static void main_deinit(void) int main(int argc, char *argv[]) { + const enum master_service_flags service_flags = + MASTER_SERVICE_FLAG_DONT_SEND_STATS; const char *admin_path; - master_service = master_service_init("director-test", 0, + master_service = master_service_init("director-test", service_flags, &argc, &argv, ""); if (master_getopt(master_service) > 0) return FATAL_DEFAULT; diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c index 77a9232106..a43cb2ff46 100644 --- a/src/lib-smtp/test-smtp-submit.c +++ b/src/lib-smtp/test-smtp-submit.c @@ -2143,6 +2143,9 @@ static void test_atexit(void) int main(int argc, char *argv[]) { + const enum master_service_flags service_flags = + MASTER_SERVICE_FLAG_STANDALONE | + MASTER_SERVICE_FLAG_DONT_SEND_STATS; int c; int ret; @@ -2154,8 +2157,8 @@ int main(int argc, char *argv[]) (void)signal(SIGSEGV, test_signal_handler); (void)signal(SIGABRT, test_signal_handler); - master_service = master_service_init("test-smtp-submit", - MASTER_SERVICE_FLAG_STANDALONE, &argc, &argv, "D"); + master_service = master_service_init("test-smtp-submit", service_flags, + &argc, &argv, "D"); while ((c = master_getopt(master_service)) > 0) { switch (c) { diff --git a/src/lib-storage/test-mail-storage.c b/src/lib-storage/test-mail-storage.c index 3b38929241..a0a4e80096 100644 --- a/src/lib-storage/test-mail-storage.c +++ b/src/lib-storage/test-mail-storage.c @@ -674,6 +674,7 @@ int main(int argc, char **argv) master_service = master_service_init("test-mail-storage", MASTER_SERVICE_FLAG_STANDALONE | + MASTER_SERVICE_FLAG_DONT_SEND_STATS | MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS | MASTER_SERVICE_FLAG_NO_SSL_INIT | MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME, diff --git a/src/plugins/mail-crypt/test-mail-key.c b/src/plugins/mail-crypt/test-mail-key.c index f17d3cc239..244503e1ed 100644 --- a/src/plugins/mail-crypt/test-mail-key.c +++ b/src/plugins/mail-crypt/test-mail-key.c @@ -488,6 +488,7 @@ int main(int argc, char **argv) master_service = master_service_init("test-mail-key", MASTER_SERVICE_FLAG_STANDALONE | + MASTER_SERVICE_FLAG_DONT_SEND_STATS | MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS | MASTER_SERVICE_FLAG_NO_SSL_INIT | MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME, -- 2.47.3