# HG changeset patch # User Sergey Kandaurov # Date 1485795999 -10800 # Node ID c883d3d3a3aba47eef6ae7521af94ed4cc09b39d # Parent a6ffc722dfcbbe12d5fdc573639975ef80c42255 Tests: server_tokens build tests. diff --git a/h2_server_tokens.t b/h2_server_tokens.t --- a/h2_server_tokens.t +++ b/h2_server_tokens.t @@ -23,7 +23,7 @@ use Test::Nginx::HTTP2; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http http_v2 rewrite/)->plan(9) +my $t = Test::Nginx->new()->has(qw/http http_v2 rewrite/) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -71,12 +71,24 @@ http { return 404; } } + + location /b { + server_tokens build; + + location /b/200 { + return 200; + } + + location /b/404 { + return 404; + } + } } } EOF -$t->run(); +$t->try_run('no server_tokens build')->plan(12); ############################################################################### @@ -94,6 +106,17 @@ like(header_server('/on/200'), qr/^$re$/ like(header_server('/on/404'), qr/^$re$/, 'http2 tokens on 404'); like(body('/on/404'), $re, 'http2 tokens on 404 body'); +$re = qr/$re \Q($1)\E/ if $t->{_configure_args} =~ /--build=(\S+)/; + +TODO: { +local $TODO = 'not yet'; + +like(header_server('/b/200'), qr/^$re$/, 'http2 tokens build 200'); +like(header_server('/b/404'), qr/^$re$/, 'http2 tokens build 404'); +like(body('/b/404'), qr/$re/, 'http2 tokens build 404 body'); + +} + ############################################################################### sub header_server { diff --git a/server_tokens.t b/server_tokens.t --- a/server_tokens.t +++ b/server_tokens.t @@ -22,7 +22,7 @@ use Test::Nginx; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http rewrite/)->plan(9) +my $t = Test::Nginx->new()->has(qw/http rewrite/) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -70,12 +70,24 @@ http { return 404; } } + + location /b { + server_tokens build; + + location /b/200 { + return 200; + } + + location /b/404 { + return 404; + } + } } } EOF -$t->run(); +$t->try_run('no server_tokens build')->plan(12); ############################################################################### @@ -93,6 +105,17 @@ like(http_get_server('/on/200'), $re, 't like(http_get_server('/on/404'), $re, 'tokens on 404'); like(http_body('/on/404'), $re, 'tokens on 404 body'); +$re = qr/$re \Q($1)\E/ if $t->{_configure_args} =~ /--build=(\S+)/; + +TODO: { +local $TODO = 'not yet'; + +like(http_get_server('/b/200'), $re, 'tokens build 200'); +like(http_get_server('/b/404'), $re, 'tokens build 404'); +like(http_body('/b/404'), $re, 'tokens build 404 body'); + +} + ############################################################################### sub http_body {