# HG changeset patch # User Sergey Kandaurov # Date 1544543971 -10800 # Node ID 01d806268a122125938c6fc716c51caf50eb80d8 # Parent f5b18471e17a0c701f73bb94d852735eb3670f27 Tests: removed TODOs for gRPC fixes merged in 1.14.2. diff --git a/grpc.t b/grpc.t --- a/grpc.t +++ b/grpc.t @@ -190,25 +190,14 @@ ok($c = $frame->{headers}{'x-connection' $frames = $f->{http_start}('/KeepAlive', reuse => 1); ($frame) = grep { $_->{type} eq "HEADERS" } @$frames; - -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.15.4'); - ok($frame, 'upstream keepalive reused'); -} - -TODO: { -todo_skip 'upstream connection failed', 2 unless $frame; - cmp_ok($frame->{sid}, '>', $sid, 'keepalive 2 - HEADERS sid next'); $f->{data}('Hello'); $frames = $f->{http_end}(); ($frame) = grep { $_->{type} eq "HEADERS" } @$frames; is($frame->{headers}{'x-connection'}, $c, 'keepalive 2 - connection reuse'); -} - undef $f; # don't bother with a new instance until the old one is over select undef, undef, undef, 0.2 unless $t->has_version('1.15.4'); diff --git a/grpc_request_buffering.t b/grpc_request_buffering.t --- a/grpc_request_buffering.t +++ b/grpc_request_buffering.t @@ -91,34 +91,20 @@ is($frame->{headers}{'x-body'}, 'Hello', # tcp_nopush usage on peer connections # reopen window for request body after initial window was exhausted -TODO: { -local $TODO = 'not yet' if $t->read_file('nginx.conf') =~ /sendfile on/ - and !$t->has_version('1.15.1') and $^O eq 'freebsd'; - $frames = $f->{http_start}('/proxy'); is(eval(join '+', map { $_->{length} } grep { $_->{type} eq "DATA" } @$frames), 65535, 'preserve_output - first body bytes'); -} - # expect body cleanup is disabled with preserve_output (ticket #1565). # after request body first bytes were proxied on behalf of initial window size, # send response header from upstream, this leads to body cleanup code path -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.15.1'); - $frames = $f->{http_end}(); is(eval(join '+', map { $_->{length} } grep { $_->{type} eq "DATA" } @$frames), 465, 'preserve_output - last body bytes'); like(`grep -F '[crit]' ${\($t->testdir())}/error.log`, qr/^$/s, 'no crits'); -} - -$t->todo_alerts() if $t->read_file('nginx.conf') =~ /sendfile on/ - and !$t->has_version('1.15.1'); - ############################################################################### sub grpc { diff --git a/grpc_ssl.t b/grpc_ssl.t --- a/grpc_ssl.t +++ b/grpc_ssl.t @@ -205,18 +205,12 @@ cmp_ok($frame->{headers}{'x-connection'} ($frame) = grep { $_->{type} eq "HEADERS" } @$frames; ok($c = $frame->{headers}{'x-connection'}, 'keepalive - connection'); -TODO: { -local $TODO = 'not yet' if ($^O eq 'MSWin32' or $^O eq 'solaris') - and !$t->has_version('1.15.4'); - $f->{http_start}('/KeepAlive'); $f->{data}('Hello'); $frames = $f->{http_end}(); ($frame) = grep { $_->{type} eq "HEADERS" } @$frames; is($frame->{headers}{'x-connection'}, $c, 'keepalive - connection reuse'); -} - ############################################################################### sub grpc {