From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 1 Jun 2021 22:40:19 +0000 (+0200)
Subject: lib-smtp: test-smtp-payload - Set all timeouts to CLIENT_PROGRESS_TIMEOUT.
X-Git-Tag: 2.3.17~345
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=357ff0b35bc4c741c87408f0c615d031c8f918b4;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: test-smtp-payload - Set all timeouts to CLIENT_PROGRESS_TIMEOUT.

This prevents connect and idle timeouts from triggering earlier than the
progress timeout.
---

diff --git a/src/lib-smtp/test-smtp-payload.c b/src/lib-smtp/test-smtp-payload.c
index efc3ae531f..7363736cc4 100644
--- a/src/lib-smtp/test-smtp-payload.c
+++ b/src/lib-smtp/test-smtp-payload.c
@@ -963,7 +963,8 @@ test_run_scenarios(
 	smtp_server_set.protocol = protocol;
 	smtp_server_set.capabilities = capabilities;
 	smtp_server_set.hostname = "localhost";
-	smtp_server_set.max_client_idle_time_msecs = 10*000;
+	smtp_server_set.max_client_idle_time_msecs =
+		CLIENT_PROGRESS_TIMEOUT*1000;
 	smtp_server_set.max_pipelined_commands = 1;
 	smtp_server_set.auth_optional = TRUE;
 	smtp_server_set.ssl = &ssl_server_set;
@@ -973,6 +974,8 @@ test_run_scenarios(
 	i_zero(&smtp_client_set);
 	smtp_client_set.my_hostname = "localhost";
 	smtp_client_set.temp_path_prefix = "/tmp";
+	smtp_client_set.command_timeout_msecs = CLIENT_PROGRESS_TIMEOUT*1000;
+	smtp_client_set.connect_timeout_msecs = CLIENT_PROGRESS_TIMEOUT*1000;
 	smtp_client_set.ssl = &ssl_client_set;
 	smtp_client_set.debug = debug;