# HG changeset patch # User Sergey Kandaurov # Date 1469556041 -10800 # Node ID 3c5d3b384d3fa5c6775e4d34d06c32c097f8c0a1 # Parent ec9b99d3e22e45b1db78dda723272a9c17c098c3 Tests: adjusted TODOs for HTTP/2 fixes committed in 1.11.3. diff --git a/h2.t b/h2.t --- a/h2.t +++ b/h2.t @@ -29,7 +29,8 @@ my $t = Test::Nginx->new()->has(qw/http # Some systems return EINVAL on zero writev iovcnt per POSIX, while others not -$t->todo_alerts() if $^O eq 'darwin' or $^O eq 'netbsd'; +$t->todo_alerts() if ($^O eq 'darwin' or $^O eq 'netbsd') + and !$t->has_version('1.11.3'); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -815,7 +816,7 @@ SKIP: { skip 'tolerant operating system', 1 unless $^O eq 'darwin' or $^O eq 'netbsd'; TODO: { -local $TODO = 'not yet'; +local $TODO = 'not yet' unless $t->has_version('1.11.3'); $sid = $s->new_stream(); $frames = $s->read(all => [{ sid => $sid, fin => 1 }]); @@ -1108,7 +1109,7 @@ my $active = Test::Nginx::HTTP2->new(por ok($frame, 'GOAWAY on connection close - idle stream'); TODO: { -local $TODO = 'not yet'; +local $TODO = 'not yet' unless $t->has_version('1.11.3'); $frames = $active->read(all => [{ type => 'GOAWAY' }]); ($frame) = grep { $_->{type} eq "GOAWAY" } @$frames; diff --git a/h2_proxy_cache.t b/h2_proxy_cache.t --- a/h2_proxy_cache.t +++ b/h2_proxy_cache.t @@ -165,7 +165,7 @@ ok(!grep ({ $_->{type} eq "DATA" } @$fra $frames = $s->read(all => [{ sid => $sid, fin => 0x4 }], wait => 1.2); TODO: { -local $TODO = 'not yet'; +local $TODO = 'not yet' unless $t->has_version('1.11.3'); ok(!(grep { $_->{type} eq "HEADERS" } @$frames), 'no headers'); @@ -173,7 +173,7 @@ ok(!(grep { $_->{type} eq "HEADERS" } @$ # client closes connection after sending a cacheable request producing alert -$t->todo_alerts(); +$t->todo_alerts() unless $t->has_version('1.11.3'); $s = Test::Nginx::HTTP2->new(); $sid = $s->new_stream({ path => '/cache/t.html?4' }); diff --git a/h2_ssl.t b/h2_ssl.t --- a/h2_ssl.t +++ b/h2_ssl.t @@ -91,7 +91,7 @@ skip 'OpenSSL ALPN/NPN support required' ok($s, 'ssl connection'); -$t->todo_alerts(); +$t->todo_alerts() unless $t->has_version('1.11.3'); my $sid = $s->new_stream({ path => '/tbig.html' }); diff --git a/h2_ssl_proxy_cache.t b/h2_ssl_proxy_cache.t --- a/h2_ssl_proxy_cache.t +++ b/h2_ssl_proxy_cache.t @@ -29,7 +29,7 @@ plan(skip_all => 'IO::Socket::SSL not in my $t = Test::Nginx->new()->has(qw/http http_ssl http_v2 proxy cache shmem/) ->has_daemon('openssl'); -$t->todo_alerts(); +$t->todo_alerts() unless $t->has_version('1.11.3'); $t->write_file_expand('nginx.conf', <<'EOF');