# HG changeset patch # User Maxim Dounin # Date 1417063195 -10800 # Node ID 071e8941e3bfba8b5ac401857c3cd532d7d3ba49 # Parent 134ea15d7473ffbbaf0faeb27ed609c3f62bd01b Tests: reduce shared memory zone sizes. diff --git a/error_log.t b/error_log.t --- a/error_log.t +++ b/error_log.t @@ -38,7 +38,7 @@ events { http { %%TEST_GLOBALS_HTTP%% - limit_req_zone $binary_remote_addr zone=one:10m rate=1r/m; + limit_req_zone $binary_remote_addr zone=one:1m rate=1r/m; limit_req zone=one; server { diff --git a/fastcgi_cache.t b/fastcgi_cache.t --- a/fastcgi_cache.t +++ b/fastcgi_cache.t @@ -39,7 +39,7 @@ http { %%TEST_GLOBALS_HTTP%% fastcgi_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; server { listen 127.0.0.1:8080; diff --git a/fastcgi_merge_params.t b/fastcgi_merge_params.t --- a/fastcgi_merge_params.t +++ b/fastcgi_merge_params.t @@ -39,7 +39,7 @@ http { %%TEST_GLOBALS_HTTP%% fastcgi_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; fastcgi_cache_key stub; diff --git a/fastcgi_merge_params2.t b/fastcgi_merge_params2.t --- a/fastcgi_merge_params2.t +++ b/fastcgi_merge_params2.t @@ -39,7 +39,7 @@ http { %%TEST_GLOBALS_HTTP%% fastcgi_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; fastcgi_cache_key stub; diff --git a/limit_req.t b/limit_req.t --- a/limit_req.t +++ b/limit_req.t @@ -37,9 +37,9 @@ events { http { %%TEST_GLOBALS_HTTP%% - limit_req_zone $binary_remote_addr zone=one:10m rate=2r/s; - limit_req_zone $binary_remote_addr zone=long:10m rate=2r/s; - limit_req_zone $binary_remote_addr zone=fast:10m rate=1000r/s; + limit_req_zone $binary_remote_addr zone=one:1m rate=2r/s; + limit_req_zone $binary_remote_addr zone=long:1m rate=2r/s; + limit_req_zone $binary_remote_addr zone=fast:1m rate=1000r/s; server { listen 127.0.0.1:8080; diff --git a/proxy_cache.t b/proxy_cache.t --- a/proxy_cache.t +++ b/proxy_cache.t @@ -37,7 +37,7 @@ http { %%TEST_GLOBALS_HTTP%% proxy_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; server { listen 127.0.0.1:8080; diff --git a/proxy_cache_chunked.t b/proxy_cache_chunked.t --- a/proxy_cache_chunked.t +++ b/proxy_cache_chunked.t @@ -40,7 +40,7 @@ events { http { %%TEST_GLOBALS_HTTP%% - proxy_cache_path %%TESTDIR%%/cache keys_zone=NAME:10m; + proxy_cache_path %%TESTDIR%%/cache keys_zone=NAME:1m; server { listen 127.0.0.1:8080; diff --git a/proxy_cache_lock.t b/proxy_cache_lock.t --- a/proxy_cache_lock.t +++ b/proxy_cache_lock.t @@ -37,7 +37,7 @@ http { %%TEST_GLOBALS_HTTP%% proxy_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; server { listen 127.0.0.1:8080; diff --git a/proxy_cache_lock_age.t b/proxy_cache_lock_age.t --- a/proxy_cache_lock_age.t +++ b/proxy_cache_lock_age.t @@ -40,7 +40,7 @@ http { %%TEST_GLOBALS_HTTP%% proxy_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; server { listen 127.0.0.1:8080; diff --git a/proxy_merge_headers.t b/proxy_merge_headers.t --- a/proxy_merge_headers.t +++ b/proxy_merge_headers.t @@ -37,7 +37,7 @@ http { %%TEST_GLOBALS_HTTP%% proxy_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; proxy_set_header X-Blah "blah"; proxy_hide_header X-Hidden; diff --git a/scgi_merge_params.t b/scgi_merge_params.t --- a/scgi_merge_params.t +++ b/scgi_merge_params.t @@ -39,7 +39,7 @@ http { %%TEST_GLOBALS_HTTP%% scgi_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; scgi_cache_key stub; diff --git a/spdy.t b/spdy.t --- a/spdy.t +++ b/spdy.t @@ -50,7 +50,7 @@ events { http { %%TEST_GLOBALS_HTTP%% - proxy_cache_path %%TESTDIR%%/cache keys_zone=NAME:10m; + proxy_cache_path %%TESTDIR%%/cache keys_zone=NAME:1m; limit_conn_zone $binary_remote_addr zone=conn:1m; server { diff --git a/ssi.t b/ssi.t --- a/ssi.t +++ b/ssi.t @@ -38,7 +38,7 @@ http { %%TEST_GLOBALS_HTTP%% proxy_cache_path %%TESTDIR%%/cache levels=1:2 - keys_zone=NAME:10m; + keys_zone=NAME:1m; server { listen 127.0.0.1:8080; diff --git a/ssl.t b/ssl.t --- a/ssl.t +++ b/ssl.t @@ -49,7 +49,7 @@ http { ssl_certificate_key localhost.key; ssl_certificate localhost.crt; - ssl_session_cache shared:SSL:10m; + ssl_session_cache shared:SSL:1m; ssl_session_tickets off; location /reuse { diff --git a/syslog.t b/syslog.t --- a/syslog.t +++ b/syslog.t @@ -43,7 +43,7 @@ events { http { %%TEST_GLOBALS_HTTP%% - limit_req_zone $binary_remote_addr zone=one:10m rate=1r/m; + limit_req_zone $binary_remote_addr zone=one:1m rate=1r/m; log_format empty ""; log_format logf "$uri:$status";