changeset 682:c68b7bbdf21a

Tests: style. Moved subroutines section, simplified configuration.
author Andrey Zelenkov <zelenkov@nginx.com>
date Tue, 08 Sep 2015 15:11:45 +0300
parents 1f8e15e1899a
children 49aea425392d
files http_server_name.t
diffstat 1 files changed, 12 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/http_server_name.t
+++ b/http_server_name.t
@@ -44,7 +44,6 @@ http {
 
         location / {
             add_header X-Server $server_name;
-            return 204;
         }
     }
 
@@ -54,7 +53,6 @@ http {
 
         location / {
             add_header X-Server $server_name;
-            return 204;
         }
     }
 
@@ -64,7 +62,6 @@ http {
 
         location / {
             add_header X-Server $server_name;
-            return 204;
         }
     }
 
@@ -75,7 +72,6 @@ http {
         location / {
             add_header X-Server $server_name;
             add_header X-Match  $name;
-            return 204;
         }
     }
 
@@ -86,28 +82,17 @@ http {
         location / {
             add_header X-Server $server_name;
             add_header X-Match  $name;
-            return 204;
         }
     }
 }
 
 EOF
 
+$t->write_file('index.html', '');
 $t->run();
 
 ###############################################################################
 
-sub http_server($) {
-	my ($host) = @_;
-	return http(<<EOF);
-GET / HTTP/1.0
-Host: $host
-
-EOF
-}
-
-###############################################################################
-
 like(http_server('xxx'), qr/X-Server: localhost/, 'default');
 
 like(http_server('www.example.com'), qr/\QX-Server: www.example.com/,
@@ -131,3 +116,14 @@ like(http_server('WWW01.EXAMPLE.COM'), q
 	'\p{N} in named capture uppercase');
 
 ###############################################################################
+
+sub http_server {
+	my ($host) = @_;
+	return http(<<EOF);
+GET / HTTP/1.0
+Host: $host
+
+EOF
+}
+
+###############################################################################