Mercurial > hg > nginx-tests
changeset 1776:f89770df737a
Tests: removed njs version checks older than 0.6.0.
| author | Dmitry Volyntsev <xeioex@nginx.com> |
|---|---|
| date | Wed, 13 Jul 2022 14:55:55 -0700 |
| parents | eacfd2b64b71 |
| children | 410072f42157 |
| files | js_buffer.t js_fetch_resolver.t js_headers.t js_ngx.t js_promise.t js_subrequests.t |
| diffstat | 6 files changed, 0 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/js_buffer.t +++ b/js_buffer.t @@ -143,10 +143,6 @@ EOF ############################################################################### -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - like(http_get('/return?text=FOO'), qr/200 OK.*body: FOO$/s, 'return buffer'); like(http_post('/req_body'), qr/200 OK.*BAR$/s, 'request buffer'); @@ -155,8 +151,6 @@ is(get_json('/res_text'), '{"a":{"b":1}, like(http_get('/binary_var'), qr/200 OK.*true$/s, 'binary var'); -} - ############################################################################### sub recode {
--- a/js_fetch_resolver.t +++ b/js_fetch_resolver.t @@ -116,9 +116,6 @@ EOF ############################################################################### -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.1'; - like(http_get('/dns?domain=aaa'), qr/aaa:GET:::$/s, 'fetch dns aaa'); like(http_get('/dns?domain=many'), qr/many:GET:::$/s, 'fetch dns many'); like(http_get('/dns?domain=unknown'), qr/"unknown" could not be resolved/s,
--- a/js_headers.t +++ b/js_headers.t @@ -429,10 +429,6 @@ unlike(http_get('/hdr_out?bar=empty'), q unlike(http_get('/hdr_out?foo='), qr/Foo:/, 'r.headersOut no value'); unlike(http_get('/hdr_out?foo'), qr/Foo:/, 'r.headersOut no value 2'); -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.4.0'; - like(http_get('/content_length_keys'), qr/B:true/, 'Content-Length in keys'); like(http_get('/content_length_arr'), qr/Content-Length: 3/, 'set Content-Length arr'); @@ -465,8 +461,6 @@ like(http_get('/hdr_out_set_cookie'), qr unlike(http_get('/hdr_out_set_cookie'), qr/Set-Cookie: [abe]/, 'set_cookie3'); -} - like(http( 'GET /hdr_in HTTP/1.0' . CRLF . 'Cookie: foo' . CRLF @@ -507,10 +501,6 @@ like(http( . 'Host: localhost' . CRLF . CRLF ), qr/content-type: bar1(?!,\s?bar2)/, 'r.headersIn duplicate single 2'); -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.4.1'; - like(http( 'GET /hdr_in HTTP/1.0' . CRLF . 'Foo: bar1' . CRLF @@ -527,8 +517,6 @@ like(http( like(http_get('/raw_hdr_out?filter=a'), qr/raw: foo|bar/, 'r.rawHeadersOut'); -} - like(http( 'GET /hdr_sorted_keys?in=1 HTTP/1.0' . CRLF . 'Cookie: foo1' . CRLF
--- a/js_ngx.t +++ b/js_ngx.t @@ -81,10 +81,6 @@ EOF ############################################################################### -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - http_get('/log?level=INFO&text=FOO'); http_get('/log?level=WARN&text=BAR'); http_get('/log?level=ERR&text=BAZ'); @@ -95,6 +91,4 @@ like($t->read_file('error.log'), qr/\[in like($t->read_file('error.log'), qr/\[warn\].*ngx.log:BAR/, 'ngx.log warn'); like($t->read_file('error.log'), qr/\[error\].*ngx.log:BAZ/, 'ngx.log err'); -} - ###############################################################################
--- a/js_promise.t +++ b/js_promise.t @@ -196,14 +196,6 @@ EOF like(http_get('/promise'), qr/{"token": "b"}/, "Promise"); like(http_get('/promise_throw'), qr/{"token": "x"}/, "Promise throw and catch"); like(http_get('/timeout'), qr/{"token": "R"}/, "Promise with timeout"); - -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - like(http_get('/promise_pure'), qr/200 OK/, "events handling"); -} - -$t->todo_alerts() unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; ###############################################################################
--- a/js_subrequests.t +++ b/js_subrequests.t @@ -542,15 +542,9 @@ is(get_json('/sr_unavail_pr'), '[{"statu like(http_get('/sr_detached_in_variable_handler'), qr/subrequest_var/, 'sr_detached_in_variable_handler'); -TODO: { -todo_skip 'leaves coredump', 1 unless $ENV{TEST_NGINX_UNSAFE} - or http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - like(http_get('/sr_error_page'), qr/reply\.status:404/, 'sr_error_page'); -} - http_get('/sr_broken'); http_get('/sr_in_sr'); http_get('/sr_in_variable_handler');