tests: use larger resolver_timeout settings.

This commit is contained in:
Yichun Zhang (agentzh) 2014-07-03 13:08:20 -07:00
Родитель 09e0944d67
Коммит 1250c5bf49
4 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -789,7 +789,7 @@ qr/recv\(\) failed \(\d+: Connection refused\) while resolving/
location ~ /myproxy { location ~ /myproxy {
rewrite ^/myproxy/(.*) /$1 break; rewrite ^/myproxy/(.*) /$1 break;
resolver_timeout 1s; resolver_timeout 3s;
#resolver 172.16.0.23; # AWS DNS resolver address is the same in all regions - 172.16.0.23 #resolver 172.16.0.23; # AWS DNS resolver address is the same in all regions - 172.16.0.23
resolver 8.8.8.8; resolver 8.8.8.8;
proxy_read_timeout 1s; proxy_read_timeout 1s;

Просмотреть файл

@ -43,7 +43,7 @@ __DATA__
server_tokens off; server_tokens off;
lua_socket_connect_timeout 100ms; lua_socket_connect_timeout 100ms;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
location /t1 { location /t1 {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()
@ -75,7 +75,7 @@ lua tcp socket connect timed out
lua_socket_connect_timeout 60s; lua_socket_connect_timeout 60s;
lua_socket_log_errors off; lua_socket_log_errors off;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
location /t2 { location /t2 {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()
@ -110,7 +110,7 @@ lua tcp socket connect timeout: 150
lua_socket_log_errors off; lua_socket_log_errors off;
lua_socket_connect_timeout 102ms; lua_socket_connect_timeout 102ms;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
#resolver_timeout 1s; #resolver_timeout 3s;
location /t3 { location /t3 {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()
@ -145,7 +145,7 @@ lua tcp socket connect timeout: 102
lua_socket_connect_timeout 102ms; lua_socket_connect_timeout 102ms;
lua_socket_log_errors off; lua_socket_log_errors off;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
location /t4 { location /t4 {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()
@ -181,7 +181,7 @@ lua tcp socket connect timeout: 102
lua_socket_connect_timeout 102ms; lua_socket_connect_timeout 102ms;
lua_socket_log_errors off; lua_socket_log_errors off;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
location /t5 { location /t5 {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()

Просмотреть файл

@ -206,7 +206,7 @@ attempt to send data on a closed socket:
--- config --- config
server_tokens off; server_tokens off;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
location /t { location /t {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()
@ -301,7 +301,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
lua_socket_connect_timeout 100ms; lua_socket_connect_timeout 100ms;
lua_socket_send_timeout 100ms; lua_socket_send_timeout 100ms;
lua_socket_read_timeout 100ms; lua_socket_read_timeout 100ms;
resolver_timeout 1s; resolver_timeout 3s;
location /test { location /test {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()
@ -373,7 +373,7 @@ connected: 1
--- config --- config
server_tokens off; server_tokens off;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
location /t { location /t {
rewrite_by_lua ' rewrite_by_lua '
local sock = ngx.socket.tcp() local sock = ngx.socket.tcp()

Просмотреть файл

@ -446,7 +446,7 @@ warn(): Thu, 01 Jan 1970 01:34:38 GMT
--- http_config --- http_config
server_tokens off; server_tokens off;
resolver $TEST_NGINX_RESOLVER; resolver $TEST_NGINX_RESOLVER;
resolver_timeout 1s; resolver_timeout 3s;
init_worker_by_lua ' init_worker_by_lua '
-- global -- global
logs = "" logs = ""