# HG changeset patch # User Sergey Kandaurov # Date 1441624191 -10800 # Node ID 99233cfefbbeb7fee79d5d46d7d286ac08452b84 # Parent 5d258aa5ebc57b727d6c2ddc889f2e0fe2daed1d Tests: adjusted test timeouts. Made tests pass on hosts with moderately unstable system clock. diff --git a/http_resolver.t b/http_resolver.t --- a/http_resolver.t +++ b/http_resolver.t @@ -55,7 +55,7 @@ http { proxy_pass http://$host:8080/backend; } location /valid { - resolver 127.0.0.1:8081 valid=3s; + resolver 127.0.0.1:8081 valid=5s; proxy_pass http://$host:8080/backend; } location /case { @@ -208,7 +208,7 @@ sleep 2; like(http_host_header('ttl.example.net', '/valid'), qr/200 OK/, 'valid overrides ttl'); -sleep 2; +sleep 4; # expired "valid" value causes nginx to make actual query diff --git a/image_filter_finalize.t b/image_filter_finalize.t --- a/image_filter_finalize.t +++ b/image_filter_finalize.t @@ -37,7 +37,7 @@ http { proxy_cache_path %%TESTDIR%%/cache keys_zone=cache:1m; - limit_req_zone $binary_remote_addr zone=limit:1m rate=50r/m; + limit_req_zone $binary_remote_addr zone=limit:1m rate=25r/m; log_format time "$request_uri:$status:$upstream_response_time"; access_log time.log time;