Mercurial > hg > nginx-tests
diff proxy.t @ 1535:144c6ce732e4
Tests: removed TODO and try_run() checks for legacy versions.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 02 Dec 2019 14:56:37 +0300 |
parents | 7959e58429d0 |
children |
line wrap: on
line diff
--- a/proxy.t +++ b/proxy.t @@ -21,7 +21,7 @@ use Test::Nginx; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(30); +my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(28); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -137,26 +137,16 @@ close ($s); $re = qr/(\d\.\d{3}|-)/; ($ct, $ct2, $ht, $ht2, $rt, $rt2) = get('/pnu', many => 1); + cmp_ok($ct, '<', 1, 'connect time - next'); cmp_ok($ct2, '<', 1, 'connect time - next 2'); -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.15.7'); - is($ht, '-', 'header time - next'); - -} - cmp_ok($ht2, '<', 1, 'header time - next 2'); + cmp_ok($rt, '>=', 1, 'response time - next'); - -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.15.7'); - is($rt2, '-', 'response time - next 2'); -} - $t->stop(); ($ct, $ht, $rt, $ct2, $ht2, $rt2, $ct3, $ht3, $rt3) @@ -164,15 +154,6 @@ is($rt2, '-', 'response time - next 2'); cmp_ok($ct, '<', 1, 'connect time log - slow response header'); cmp_ok($ct2, '<', 1, 'connect time log - slow response body'); - -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.15.7'); - -isnt($ct3, '-', 'connect time log - client close set'); - -} - -$ct3 = 0 if $ct3 eq '-'; cmp_ok($ct3, '<', 1, 'connect time log - client close'); cmp_ok($ht, '>=', 1, 'header time log - slow response header'); @@ -181,16 +162,8 @@ is($ht3, '-', 'header time log - client cmp_ok($rt, '>=', 1, 'response time log - slow response header'); cmp_ok($rt2, '>=', 1, 'response time log - slow response body'); - -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.15.7'); - -isnt($rt3, '-', 'response time log - client close set'); -$rt3 = 0 if $rt3 eq '-'; cmp_ok($rt3, '>', $ct3, 'response time log - client close'); -} - ############################################################################### sub get {