changeset 20:8d8eaaf07663

Keepalive: tests cleanup.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 10 Sep 2010 13:39:15 +0400
parents 2ce9d8a1ca93
children 9a4ee6fe1c6d
files t/fastcgi-keepalive.t t/memcached-keepalive.t
diffstat 2 files changed, 8 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/t/fastcgi-keepalive.t	Fri Aug 28 20:45:15 2009 +0400
+++ b/t/fastcgi-keepalive.t	Fri Sep 10 13:39:15 2010 +0400
@@ -20,19 +20,16 @@
 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 @@
     }
 
     server {
-        listen       localhost:8080;
+        listen       127.0.0.1:8080;
         server_name  localhost;
 
         location / {
--- a/t/memcached-keepalive.t	Fri Aug 28 20:45:15 2009 +0400
+++ b/t/memcached-keepalive.t	Fri Sep 10 13:39:15 2010 +0400
@@ -23,19 +23,16 @@
 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 @@
     }
 
     server {
-        listen       localhost:8080;
+        listen       127.0.0.1:8080;
         server_name  localhost;
 
         location / {