Mercurial > hg > nginx-tests

changeset 1120:a6ffc722dfcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: refactored server_tokens tests, no functional changes.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 30 Jan 2017 20:06:39 +0300
parents cfe1bc3162f9
children c883d3d3a3ab
files h2_server_tokens.t server_tokens.t
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/h2_server_tokens.t
+++ b/h2_server_tokens.t
@@ -80,21 +80,19 @@ EOF
 
 ###############################################################################
 
-like(header_server('/200'), qr/^nginx\/\d+\.\d+\.\d+$/,
-	'http2 tokens default 200');
-like(header_server('/404'), qr/^nginx\/\d+\.\d+\.\d+$/,
-	'http2 tokens default 404');
-like(body('/404'), qr/nginx\/\d+\.\d+\.\d+/, 'http2 tokens default 404 body');
+my $re = qr/nginx\/\d+\.\d+\.\d+/;
+
+like(header_server('/200'), qr/^$re$/, 'http2 tokens default 200');
+like(header_server('/404'), qr/^$re$/, 'http2 tokens default 404');
+like(body('/404'), qr/$re/, 'http2 tokens default 404 body');
 
 is(header_server('/off/200'), 'nginx', 'http2 tokens off 200');
 is(header_server('/off/404'), 'nginx', 'http2 tokens off 404');
 like(body('/off/404'), qr/nginx(?!\/)/, 'http2 tokens off 404 body');
 
-like(header_server('/on/200'), qr/^nginx\/\d+\.\d+\.\d+$/,
-	'http2 tokens on 200');
-like(header_server('/on/404'), qr/^nginx\/\d+\.\d+\.\d+$/,
-	'http2 tokens on 404');
-like(body('/on/404'), qr/nginx\/\d+\.\d+\.\d+/, 'http2 tokens on 404 body');
+like(header_server('/on/200'), qr/^$re$/, 'http2 tokens on 200');
+like(header_server('/on/404'), qr/^$re$/, 'http2 tokens on 404');
+like(body('/on/404'), $re, 'http2 tokens on 404 body');
 
 ###############################################################################
 
--- a/server_tokens.t
+++ b/server_tokens.t
@@ -79,17 +79,19 @@ EOF
 
 ###############################################################################
 
-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');
+my $re = qr/nginx\/\d+\.\d+\.\d+/;
+
+like(http_get_server('/200'), $re, 'tokens default 200');
+like(http_get_server('/404'), $re, 'tokens default 404');
+like(http_body('/404'), $re, 'tokens default 404 body');
 
 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_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');
+like(http_get_server('/on/200'), $re, 'tokens on 200');
+like(http_get_server('/on/404'), $re, 'tokens on 404');
+like(http_body('/on/404'), $re, 'tokens on 404 body');
 
 ###############################################################################