# HG changeset patch # User Maxim Dounin # Date 1284111555 -14400 # Node ID 8d8eaaf07663696618f5fd3ce0faf818cd70c6bd # Parent 2ce9d8a1ca9312a955f4f4db4ea567aca8460b4c Keepalive: tests cleanup. diff --git a/t/fastcgi-keepalive.t b/t/fastcgi-keepalive.t --- a/t/fastcgi-keepalive.t +++ b/t/fastcgi-keepalive.t @@ -20,19 +20,16 @@ select STDOUT; $| = 1; my $t = Test::Nginx->new()->plan(6) ->write_file_expand('nginx.conf', <<'EOF'); +%%TEST_GLOBALS%% + master_process off; daemon off; events { - worker_connections 1024; } http { - access_log off; - - client_body_temp_path %%TESTDIR%%/client_body_temp; - fastcgi_temp_path %%TESTDIR%%/fastcgi_temp; - proxy_temp_path %%TESTDIR%%/proxy_temp; + %%TEST_GLOBALS_HTTP%% upstream backend { server 127.0.0.1:8081; @@ -40,7 +37,7 @@ http { } server { - listen localhost:8080; + listen 127.0.0.1:8080; server_name localhost; location / { diff --git a/t/memcached-keepalive.t b/t/memcached-keepalive.t --- a/t/memcached-keepalive.t +++ b/t/memcached-keepalive.t @@ -23,19 +23,16 @@ plan(skip_all => 'Cache::Memcached not i my $t = Test::Nginx->new()->has('rewrite')->has_daemon('memcached')->plan(16) ->write_file_expand('nginx.conf', <<'EOF'); +%%TEST_GLOBALS%% + master_process off; daemon off; events { - worker_connections 1024; } http { - access_log off; - - client_body_temp_path %%TESTDIR%%/client_body_temp; - fastcgi_temp_path %%TESTDIR%%/fastcgi_temp; - proxy_temp_path %%TESTDIR%%/proxy_temp; + %%TEST_GLOBALS_HTTP%% upstream memd { server 127.0.0.1:8081; @@ -61,7 +58,7 @@ http { } server { - listen localhost:8080; + listen 127.0.0.1:8080; server_name localhost; location / {