# HG changeset patch # User Sergey Kandaurov # Date 1485795999 -10800 # Node ID a6ffc722dfcbbe12d5fdc573639975ef80c42255 # Parent cfe1bc3162f91df3a2160033bbdb17e8b33e9c01 Tests: refactored server_tokens tests, no functional changes. diff --git a/h2_server_tokens.t b/h2_server_tokens.t --- 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'); ############################################################################### diff --git a/server_tokens.t b/server_tokens.t --- 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'); ###############################################################################