Mercurial > hg > nginx-tests

changeset 1679:74986ebee2fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 19 May 2021 04:32:59 +0300
parents d0025a0dead7
children e6bf510f5e13
files mail_error_log.t mail_imap.t mail_imap_ssl.t mail_pop3.t mail_proxy_protocol.t mail_proxy_smtp_auth.t mail_resolver.t mail_smtp.t mail_smtp_greeting_delay.t mail_smtp_xclient.t worker_shutdown_timeout_mail.t
diffstat 11 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 {
--- 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 {
--- 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;
 
--- 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 {
--- 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;
--- 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;
--- 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;
 
--- 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;
 
--- 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;
 
--- 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;
 
--- 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;