Mercurial > hg > nginx-tests

changeset 878:327044615c87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: added http_get_server subroutine in server_tokens.t.
author Andrey Zelenkov <zelenkov@nginx.com>
date Wed, 23 Mar 2016 19:58:55 +0300
parents 8c7414010ae8
children 127a602f36c8
files server_tokens.t
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/server_tokens.t
+++ b/server_tokens.t
@@ -12,8 +12,6 @@ use strict;
 
 use Test::More;
 
-use Socket qw/ $CRLF /;
-
 BEGIN { use FindBin; chdir($FindBin::Bin); }
 
 use lib 'lib';
@@ -80,16 +78,16 @@ EOF
 
 ###############################################################################
 
-like(http_get('/200'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens default 200');
-like(http_get('/404'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens default 404');
+like(http_get_server('/200'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens default 200');
+like(http_get_server('/404'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens default 404');
 like(http_body('/404'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens default 404 body');
 
-like(http_get('/off/200'), qr/Server: nginx${CRLF}/, 'tokens off 200');
-like(http_get('/off/404'), qr/Server: nginx${CRLF}/, 'tokens off 404');
+is(http_get_server('/off/200'), 'nginx', 'tokens off 200');
+is(http_get_server('/off/404'), 'nginx', 'tokens off 404');
 like(http_body('/off/404'), qr/nginx(?!\/)/, 'tokens off 404 body');
 
-like(http_get('/on/200'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens on 200');
-like(http_get('/on/404'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens on 404');
+like(http_get_server('/on/200'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens on 200');
+like(http_get_server('/on/404'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens on 404');
 like(http_body('/on/404'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens on 404 body');
 
 ###############################################################################
@@ -99,4 +97,10 @@ sub http_body {
 	return http_get($uri) =~ /.*?\x0d\x0a?\x0d\x0a?(.*)/ms && $1;
 }
 
+sub http_get_server {
+	my ($url) = @_;
+	http_get($url) =~ /^Server:\s(.+?)\x0d?$/mi;
+	return $1;
+}
+
 ###############################################################################