# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1621387979 -10800
# Node ID 74986ebee2fd2c4e20e05cadb5f856cdd438ef2e
# Parent  d0025a0dead7440f16fa3743f574b08edf03c1e5
Tests: added proxy_timeout in mail tests.

Default proxy_timeout in mail proxy is 24h, so if nginx shutdown after a test
waits for the timeout to expire for some reason, this may take a while
and hard to diagnose.

diff --git a/mail_error_log.t b/mail_error_log.t
--- a/mail_error_log.t
+++ b/mail_error_log.t
@@ -44,6 +44,7 @@ events {
 }
 
 mail {
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
 
     server {
diff --git a/mail_imap.t b/mail_imap.t
--- a/mail_imap.t
+++ b/mail_imap.t
@@ -38,6 +38,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
 
     server {
diff --git a/mail_imap_ssl.t b/mail_imap_ssl.t
--- a/mail_imap_ssl.t
+++ b/mail_imap_ssl.t
@@ -46,6 +46,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
     auth_http_pass_client_cert on;
 
diff --git a/mail_pop3.t b/mail_pop3.t
--- a/mail_pop3.t
+++ b/mail_pop3.t
@@ -38,6 +38,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
 
     server {
diff --git a/mail_proxy_protocol.t b/mail_proxy_protocol.t
--- a/mail_proxy_protocol.t
+++ b/mail_proxy_protocol.t
@@ -39,6 +39,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout             15s;
     proxy_smtp_auth           on;
     proxy_protocol            on;
     auth_http  http://127.0.0.1:8080/mail/auth;
diff --git a/mail_proxy_smtp_auth.t b/mail_proxy_smtp_auth.t
--- a/mail_proxy_smtp_auth.t
+++ b/mail_proxy_smtp_auth.t
@@ -39,6 +39,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout             15s;
     proxy_smtp_auth           on;
     auth_http  http://127.0.0.1:8080/mail/auth;
     smtp_auth  login plain external;
diff --git a/mail_resolver.t b/mail_resolver.t
--- a/mail_resolver.t
+++ b/mail_resolver.t
@@ -46,6 +46,8 @@ mail {
     smtp_auth    none;
     server_name  locahost;
 
+    proxy_timeout 15s;
+
     # prevent useless resend
     resolver_timeout 2s;
 
diff --git a/mail_smtp.t b/mail_smtp.t
--- a/mail_smtp.t
+++ b/mail_smtp.t
@@ -39,6 +39,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
     xclient    off;
 
diff --git a/mail_smtp_greeting_delay.t b/mail_smtp_greeting_delay.t
--- a/mail_smtp_greeting_delay.t
+++ b/mail_smtp_greeting_delay.t
@@ -34,6 +34,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
     xclient    off;
 
diff --git a/mail_smtp_xclient.t b/mail_smtp_xclient.t
--- a/mail_smtp_xclient.t
+++ b/mail_smtp_xclient.t
@@ -36,6 +36,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
     xclient    on;
 
diff --git a/worker_shutdown_timeout_mail.t b/worker_shutdown_timeout_mail.t
--- a/worker_shutdown_timeout_mail.t
+++ b/worker_shutdown_timeout_mail.t
@@ -40,6 +40,7 @@ events {
 
 mail {
     proxy_pass_error_message  on;
+    proxy_timeout  15s;
     auth_http  http://127.0.0.1:8080/mail/auth;
     xclient    off;