# HG changeset patch # User Dmitry Volyntsev # Date 1670031976 28800 # Node ID 7cf848422b28f706c03b16568ac1837bdfcb162f # Parent c41ac260299f10ed5d294d0e0b1f61eddca16d08 Tests: removed remaining njs version checks older than 0.6.0. diff --git a/js.t b/js.t --- a/js.t +++ b/js.t @@ -284,10 +284,6 @@ like(http_get('/return_method?c=301&t=pa like(http_get('/return_method?c=404'), qr/404 Not.*html/s, 'return error page'); like(http_get('/return_method?c=inv'), qr/ 500 /, 'return invalid'); -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - like(http_get('/type?path=variables.host'), qr/200 OK.*type: string$/s, 'variables type'); like(http_get('/type?path=rawVariables.host'), qr/200 OK.*type: buffer$/s, @@ -300,8 +296,6 @@ like(http_post('/type?path=requestBuffer like(http_post('/request_body_cache'), qr/requestText:string requestBuffer:buffer$/s, 'request body cache'); -} - like(http_get('/var'), qr/variable=127.0.0.1/, 'r.variables'); like(http_get('/global'), qr/global=njs/, 'global code'); like(http_get('/log'), qr/200 OK/, 'r.log'); diff --git a/stream_js_buffer.t b/stream_js_buffer.t --- a/stream_js_buffer.t +++ b/stream_js_buffer.t @@ -159,10 +159,6 @@ EOF ############################################################################### -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - is(stream('127.0.0.1:' . port(8081))->read(), 'buffer', 'var type'); is(stream('127.0.0.1:' . port(8082))->read(), 'true', 'binary var'); @@ -177,6 +173,5 @@ ok(index($t->read_file('error.log'), 'cb > 0, 'cb mismatch'); ok(index($t->read_file('error.log'), 'cb_mismatch2:mixing string and buffer') > 0, 'cb mismatch'); -} ############################################################################### diff --git a/stream_js_exit.t b/stream_js_exit.t --- a/stream_js_exit.t +++ b/stream_js_exit.t @@ -105,9 +105,6 @@ EOF ############################################################################### -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.2'; - stream('127.0.0.1:' . port(8081))->io('###'); stream('127.0.0.1:' . port(8082))->io('###'); diff --git a/stream_js_fetch.t b/stream_js_fetch.t --- a/stream_js_fetch.t +++ b/stream_js_fetch.t @@ -178,9 +178,6 @@ EOF ############################################################################### -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.1'; - is(stream('127.0.0.1:' . port(8081))->io('###'), '', 'preread not enough'); is(stream('127.0.0.1:' . port(8081))->io("\xAB\xCDQZ##"), "\xAB\xCDQZ##", 'preread validated'); diff --git a/stream_js_ngx.t b/stream_js_ngx.t --- a/stream_js_ngx.t +++ b/stream_js_ngx.t @@ -83,10 +83,6 @@ EOF ############################################################################### -TODO: { -local $TODO = 'not yet' - unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0'; - is(stream('127.0.0.1:' . port(8081))->read(), 'OK', 'log var'); $t->stop(); @@ -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'); -} - ###############################################################################