Mercurial > hg > nginx-tests
diff proxy_if.t @ 568:907e89fba9c3
Tests: removed TODO and try_run() checks for legacy versions.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Sun, 03 May 2015 12:45:09 +0300 |
parents | ee7a6a144437 |
children | 355f2d5ff60f |
line wrap: on
line diff
--- a/proxy_if.t +++ b/proxy_if.t @@ -183,9 +183,6 @@ like(http_get('/'), qr!uri:/$!, 'proxy r like(http_get('/proxy-pass-uri'), qr!uri:/replacement$!, 'proxy_pass uri changed'); -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.7.9'); - # due to missing information about an original location where # proxy_pass was specified, this used to pass request with # original unmodified uri @@ -193,8 +190,6 @@ local $TODO = 'not yet' unless $t->has_v like(http_get('/proxy-pass-uri?if=1'), qr!uri:/replacement$!, 'proxy_pass uri changed in if'); -} - like(http_get('/proxy-pass-uri/inner'), qr!404 Not Found!, 'proxy_pass uri changed inner'); like(http_get('/proxy-pass-uri/inner?if=1'), qr!404 Not Found!, @@ -205,17 +200,12 @@ like(http_get('/proxy-pass-uri/inner?if= like(http_get('/proxy-pass-uri-lmt'), qr!uri:/replacement$!, 'proxy_pass uri and limit_except'); -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.7.9'); - # special handling of limit_except resulted in wrong handling # of requests in nested locations like(http_get('/proxy-pass-uri-lmt/inner'), qr!404 Not Found!, 'proxy_pass uri and limit_except, inner'); -} - like(http_get('/proxy-pass-uri-lmt-different'), qr!uri:/proxy-pass-uri-lmt-different!, 'proxy_pass and limit_except with different proxy_pass'); @@ -232,17 +222,11 @@ like(http_get('/proxy-inside-if-crash'), like(http_get('/variables'), qr!uri:/outer!, 'proxy_pass variables'); - -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.7.9'); - like(http_get('/variables?if=1'), qr!uri:/variables!, 'proxy_pass variables if'); like(http_get('/variables/inner'), qr!uri:/variables/inner!, 'proxy_pass variables nested'); -} - # ssl context shouldn't be inherited into nested # locations with different proxy_pass, but should # be correctly inherited into if's @@ -251,13 +235,7 @@ like(http_get('/ssl'), qr!uri:/outer!, 'proxy_pass ssl'); like(http_get('/ssl?if=1'), qr!uri:/outer!, 'proxy_pass ssl inside if'); - -TODO: { -local $TODO = 'not yet' unless $t->has_version('1.7.9'); - like(http_get('/ssl/inner'), qr!uri:/ssl/inner!, 'proxy_pass nossl inside ssl'); -} - ###############################################################################