# HG changeset patch # User Sergey Kandaurov # Date 1637673286 -10800 # Node ID b27bcded6449871e4ca4c5134fbfd4c9075d638f # Parent 7f09d144d15c8bd8416b6d1aebeda27e928dd56e Tests: removed TODOs for fixes merged in 1.20.2. diff --git a/grpc.t b/grpc.t --- a/grpc.t +++ b/grpc.t @@ -279,17 +279,12 @@ undef $f; ($frame) = grep { $_->{type} eq "HEADERS" } @$frames; ok($c = $frame->{headers}{'x-connection'}, 'keepalive 5 - GOAWAY next stream'); -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.21.1'); - $f->{http_start}('/KeepAlive'); $f->{data}('Hello'); $frames = $f->{http_end}(); ($frame) = grep { $_->{type} eq "HEADERS" } @$frames; cmp_ok($frame->{headers}{'x-connection'}, '>', $c, 'keepalive 5 - closed'); -} - undef $f; $f = grpc(); diff --git a/grpc_ssl.t b/grpc_ssl.t --- a/grpc_ssl.t +++ b/grpc_ssl.t @@ -200,10 +200,6 @@ cmp_ok($frame->{headers}{'x-connection'} my $sum = eval join '+', map { $_->{type} eq "DATA" && $_->{length} } @$frames; is($sum, 65535, 'flow control - iws length'); -TODO: { -local $TODO = 'not yet' if ($^O eq 'MSWin32' or $^O eq 'solaris') - and !$t->has_version('1.21.2'); - $f->{update}(10); $f->{update_sid}(10); @@ -220,8 +216,6 @@ is($frame->{flags}, 0, 'flow control - u is($frame->{length}, 5, 'flow control - rest length'); is($frame->{flags}, 1, 'flow control - rest flags'); -} - $f->{http_end}(); # upstream keepalive 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 @@ -118,12 +118,6 @@ select undef, undef, undef, 0.2; $t->stop(); -# "aio_write" is used to produce "open socket ... left in connection" alerts. - -$t->todo_alerts() if $t->read_file('nginx.conf') =~ /aio_write on/ - and $t->read_file('nginx.conf') =~ /aio threads/ and $^O eq 'linux' - and !$t->has_version('1.21.4'); - ############################################################################### sub getconn { diff --git a/ssl.t b/ssl.t --- a/ssl.t +++ b/ssl.t @@ -326,15 +326,9 @@ is(get_ssl_shutdown(8085), 1, 'ssl shutd $t->stop(); -TODO: { -local $TODO = 'not yet' - if $t->has_version('1.19.5') and !$t->has_version('1.21.1'); - like($t->read_file('ssl.log'), qr/^(TLS|SSL)v(\d|\.)+$/m, 'log ssl variable on lingering close'); -} - like(`grep -F '[crit]' ${\($t->testdir())}/error.log`, qr/^$/s, 'no crit'); ############################################################################### diff --git a/uwsgi_body.t b/uwsgi_body.t --- a/uwsgi_body.t +++ b/uwsgi_body.t @@ -92,14 +92,9 @@ like(http_get_length('/', ''), qr/cl=0 ' # rewrite set is used to cache $content_length early -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.21.4'); - like(http_get_chunked('/', 'foobar'), qr/cl=6 'foobar'/, 'uwsgi chunked'); like(http_get_chunked('/', ''), qr/cl=0 ''/, 'uwsgi empty chunked'); -} - ############################################################################### sub http_get_length {