# HG changeset patch # User Sergey Kandaurov # Date 1459521018 -10800 # Node ID 266e3b2e88f9f8fc550d1a1e9cecb8451291162f # Parent 4ab795ab2e629407c253d8b2db58c6e32094c99e Tests: adjusted HTTP/2 TODOs, request body fixes committed. diff --git a/h2_limit_req.t b/h2_limit_req.t --- a/h2_limit_req.t +++ b/h2_limit_req.t @@ -26,9 +26,7 @@ select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http http_v2 proxy rewrite limit_req/) ->plan(6); -# Some systems may have also a bug in not treating zero writev iovcnt as EINVAL - -$t->todo_alerts(); +$t->todo_alerts() unless $t->has_version('1.9.14'); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -84,6 +82,7 @@ is(read_body_file($frame->{headers}->{'x 'request body - limit req'); # request body delayed in limit_req - with an empty DATA frame +# "zero size buf in output" alerts seen $sess = new_session(); $sid = new_stream($sess, { path => '/proxy_limit_req/', body_more => 1 }); diff --git a/h2_proxy_ssl.t b/h2_proxy_ssl.t --- a/h2_proxy_ssl.t +++ b/h2_proxy_ssl.t @@ -26,7 +26,7 @@ select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http http_ssl http_v2 proxy/) ->has_daemon('openssl')->plan(1); -$t->todo_alerts(); +$t->todo_alerts() unless $t->has_version('1.9.14'); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -84,7 +84,7 @@ foreach my $name ('localhost') { # "zero size buf in output" alerts seen TODO: { -local $TODO = 'not yet'; +local $TODO = 'not yet' unless $t->has_version('1.9.14'); my $sess = new_session(); my $sid = new_stream($sess, { path => '/proxy_ssl/', body_more => 1 }); diff --git a/h2_request_body.t b/h2_request_body.t --- a/h2_request_body.t +++ b/h2_request_body.t @@ -25,7 +25,7 @@ select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http http_v2 proxy/)->plan(35); -$t->todo_alerts(); +$t->todo_alerts() unless $t->has_version('1.9.14'); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -133,7 +133,7 @@ h2_body($sess, ''); is($frame->{headers}->{':status'}, 200, 'request body - empty'); TODO: { -local $TODO = 'not yet'; +local $TODO = 'not yet' unless $t->has_version('1.9.14'); ok($frame->{headers}{'x-body-file'}, 'request body - empty body file'); @@ -151,7 +151,7 @@ is(read_body_file($frame->{headers}{'x-b # RST_STREAM with zero code received TODO: { -local $TODO = 'not yet'; +local $TODO = 'not yet' unless $t->has_version('1.9.14'); $sess = new_session(); $sid = new_stream($sess, { body_more => 1 });