diff h2_limit_req.t @ 1020:196d33c2bb45

Tests: removed TODO and try_run() checks for legacy versions. Also removed now unused spdy.t and shmem prerequisite.
author Andrey Zelenkov <zelenkov@nginx.com>
date Wed, 31 Aug 2016 18:21:07 +0300
parents 882267679006
children efc502e696b0
line wrap: on
line diff
--- a/h2_limit_req.t
+++ b/h2_limit_req.t
@@ -26,8 +26,6 @@ select STDOUT; $| = 1;
 my $t = Test::Nginx->new()->has(qw/http http_v2 proxy rewrite limit_req/)
 	->plan(7);
 
-$t->todo_alerts() unless $t->has_version('1.9.14');
-
 $t->write_file_expand('nginx.conf', <<'EOF');
 
 %%TEST_GLOBALS%%
@@ -81,9 +79,6 @@ my ($frame) = grep { $_->{type} eq "HEAD
 is(read_body_file($frame->{headers}->{'x-body-file'}), 'TEST',
 	'request body - limit req');
 
-TODO: {
-local $TODO = 'not yet' unless $t->has_version('1.9.15');
-
 $s = Test::Nginx::HTTP2->new();
 $sid = $s->new_stream({ path => '/proxy_limit_req/', body_more => 1 });
 select undef, undef, undef, 1.1;
@@ -94,8 +89,6 @@ select undef, undef, undef, 1.1;
 is(read_body_file($frame->{headers}->{'x-body-file'}), 'TEST',
 	'request body - limit req - limited');
 
-}
-
 # request body delayed in limit_req - with an empty DATA frame
 # "zero size buf in output" alerts seen
 
@@ -114,7 +107,6 @@ is($frame->{headers}->{':status'}, 200, 
 my ($maxwin) = sort {$a <=> $b} $s->{streams}{$sid}, $s->{conn_window};
 
 SKIP: {
-skip 'leaves coredump', 1 unless $t->has_version('1.9.7');
 skip 'not enough window', 1 if $maxwin < 5;
 
 $s = Test::Nginx::HTTP2->new();
@@ -136,10 +128,6 @@ is(read_body_file($frame->{headers}->{'x
 SKIP: {
 skip 'not enough window', 1 if $maxwin < 4;
 
-TODO: {
-todo_skip 'use-after-free', 1 unless $ENV{TEST_NGINX_UNSAFE}
-	or $t->has_version('1.9.12');
-
 $sid = $s->new_stream({ path => '/limit_req', body => 'TEST', split => [61],
 	split_delay => 1.1 });
 $frames = $s->read(all => [{ sid => $sid, fin => 1 }]);
@@ -149,8 +137,6 @@ is($frame->{headers}->{':status'}, '200'
 
 }
 
-}
-
 $sid = $s->new_stream({ path => '/' });
 $frames = $s->read(all => [{ sid => $sid, fin => 1 }]);
 
@@ -163,10 +149,6 @@ is($frame->{headers}->{':status'}, '200'
 SKIP: {
 skip 'not enough window', 1 if $maxwin < 4;
 
-TODO: {
-todo_skip 'use-after-free', 1 unless $ENV{TEST_NGINX_UNSAFE}
-	or $t->has_version('1.9.12');
-
 $s = Test::Nginx::HTTP2->new();
 $sid = $s->new_stream({ path => '/limit_req', body => 'TEST', split => [61],
 	abort => 1 });
@@ -178,8 +160,6 @@ pass('discard body - limit req - eof');
 
 }
 
-}
-
 ###############################################################################
 
 sub read_body_file {