# HG changeset patch # User Maxim Dounin # Date 1353887245 -14400 # Node ID a01a53bcbf11cbb841058b3b244a15e294dc56ec # Parent 462d89f5732a13569b53545527bf2a266b0b0452 Tests: remove unneeded TODOs. diff --git a/auth_basic.t b/auth_basic.t --- a/auth_basic.t +++ b/auth_basic.t @@ -105,16 +105,9 @@ unlike(http_get_auth('/', 'plain', '123' unlike(http_get_auth('/', 'ssha', '123'), qr!SEETHIS!, 'ssha wrong'); like(http_get_auth('/', 'apr12', '1'), qr!401 Unauthorized!, 'apr1 md5 broken'); - -SKIP: { -skip 'unsafe', 2 unless $ENV{TEST_NGINX_UNSAFE}; -local $TODO = 'not yet'; - like(http_get_auth('/', 'ssha2', '1'), qr!401 Unauthorized!, 'ssha broken 1'); like(http_get_auth('/', 'ssha3', '1'), qr!401 Unauthorized!, 'ssha broken 2'); -} - ############################################################################### sub http_get_auth { diff --git a/fastcgi_header_params.t b/fastcgi_header_params.t --- a/fastcgi_header_params.t +++ b/fastcgi_header_params.t @@ -56,16 +56,9 @@ EOF ############################################################################### -SKIP: { -skip 'unsafe', 1 unless $ENV{TEST_NGINX_UNSAFE}; - -local $TODO = 'not yet'; - like(http_get_headers('/'), qr/SEE-THIS/, 'fastcgi request with many ignored headers'); -} - ############################################################################### sub http_get_headers { diff --git a/map.t b/map.t --- a/map.t +++ b/map.t @@ -68,12 +68,6 @@ like(http_get('/?1'), qr/x:0 y:0/, 'map like(http_get('/?foo'), qr/x:bar y:0/, 'map foo bar'); like(http_get('/?example.com'), qr/x:0 y:foo/, 'map example.com foo'); like(http_get('/?example.org'), qr/x:0 y:wild/, 'map example.org wildcard'); - -TODO: { -local $TODO = 'not yet'; - like(http_get('/?example.com.'), qr/x:0 y:foo/, 'map example.com. foo'); -} - ############################################################################### diff --git a/proxy_cache_chunked.t b/proxy_cache_chunked.t --- a/proxy_cache_chunked.t +++ b/proxy_cache_chunked.t @@ -62,12 +62,7 @@ EOF ############################################################################### like(http_get("/"), qr/SEE-THIS/s, "chunked"); - -TODO: { -local $TODO = 'not yet'; - like(http_get("/"), qr/SEE-THIS.*HIT/s, "chunked cached"); -} ############################################################################### diff --git a/proxy_merge_headers.t b/proxy_merge_headers.t --- a/proxy_merge_headers.t +++ b/proxy_merge_headers.t @@ -98,12 +98,7 @@ like(http_get_ims('/setbody/'), qr/blah= unlike(http_get('/'), qr/X-Pad/, 'proxy_pass_header default'); like(http_get('/nested/'), qr/X-Pad/, 'proxy_pass_header nested'); unlike(http_get('/'), qr/X-Hidden/, 'proxy_hide_header inherited'); - -TODO: { -local $TODO = 'not yet'; - unlike(http_get('/nested/'), qr/X-Hidden/, 'proxy_hide_header nested'); -} ############################################################################### diff --git a/range_if_range.t b/range_if_range.t --- a/range_if_range.t +++ b/range_if_range.t @@ -104,14 +104,8 @@ like($t1, qr/Last-Modified: Mon, 28 Sep $t1 = http_get_range('/t3.html', "Range: bytes=0-9\nIf-Range: Mon, 28 Sep 1970 06:00:00 GMT"); - -TODO: { -local $TODO = 'requires add_header changes after if-range fix'; - like($t1, qr/206/, 'if-range time'); -} - ############################################################################### sub http_get_range { diff --git a/rewrite.t b/rewrite.t --- a/rewrite.t +++ b/rewrite.t @@ -219,13 +219,8 @@ like(http_get('/capture/%25?a=b'), qr!^uri:/capture/% args:c=d&a=b$!ms, 'escape with added args'); -TODO: { -local $TODO = 'patch pending'; - like(http_get('/capturedup/%25?a=b'), qr!^uri:/capturedup/% args:c=/capturedup/%25&a=b$!ms, 'escape with added args'); -} - ############################################################################### diff --git a/scgi.t b/scgi.t --- a/scgi.t +++ b/scgi.t @@ -63,15 +63,9 @@ like(http_get('/'), qr/^3$/m, 'scgi thir unlike(http_head('/'), qr/SEE-THIS/, 'no data in HEAD'); -SKIP: { -skip 'unsafe', 1 unless $ENV{TEST_NGINX_UNSAFE}; -local $TODO = 'not yet'; - like(http_get_headers('/headers'), qr/SEE-THIS/, 'scgi request with many ignored headers'); -} - ############################################################################### sub http_get_headers { diff --git a/uwsgi.t b/uwsgi.t --- a/uwsgi.t +++ b/uwsgi.t @@ -70,15 +70,9 @@ END like(http_get('/'), qr/SEE-THIS/, 'uwsgi request'); unlike(http_head('/head'), qr/SEE-THIS/, 'no data in HEAD'); -SKIP: { -skip 'unsafe', 1 unless $ENV{TEST_NGINX_UNSAFE}; -local $TODO = 'not yet'; - like(http_get_headers('/headers'), qr/SEE-THIS/, 'uwsgi request with many ignored headers'); -} - ############################################################################### sub http_get_headers {