Skip to content

Commit 39558ee

Browse files
committed
Tests: removed njs version checks older than 0.6.0.
1 parent 249c918 commit 39558ee

File tree

6 files changed

+0
-41
lines changed

6 files changed

+0
-41
lines changed

js_buffer.t

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ $t->try_run('no njs buffer')->plan(5);
143143

144144
###############################################################################
145145

146-
TODO: {
147-
local $TODO = 'not yet'
148-
unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
149-
150146
like(http_get('/return?text=FOO'), qr/200 OK.*body: FOO$/s,
151147
'return buffer');
152148
like(http_post('/req_body'), qr/200 OK.*BAR$/s, 'request buffer');
@@ -155,8 +151,6 @@ is(get_json('/res_text'), '{"a":{"b":1},"type":"string"}', 'response text');
155151
like(http_get('/binary_var'), qr/200 OK.*true$/s,
156152
'binary var');
157153

158-
}
159-
160154
###############################################################################
161155

162156
sub recode {

js_fetch_resolver.t

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ $t->waitforfile($t->testdir . '/' . port(8981));
116116

117117
###############################################################################
118118

119-
local $TODO = 'not yet'
120-
unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.1';
121-
122119
like(http_get('/dns?domain=aaa'), qr/aaa:GET:::$/s, 'fetch dns aaa');
123120
like(http_get('/dns?domain=many'), qr/many:GET:::$/s, 'fetch dns many');
124121
like(http_get('/dns?domain=unknown'), qr/"unknown" could not be resolved/s,

js_headers.t

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,6 @@ unlike(http_get('/hdr_out?bar=empty'), qr/Bar:/, 'r.headersOut empty');
429429
unlike(http_get('/hdr_out?foo='), qr/Foo:/, 'r.headersOut no value');
430430
unlike(http_get('/hdr_out?foo'), qr/Foo:/, 'r.headersOut no value 2');
431431

432-
TODO: {
433-
local $TODO = 'not yet'
434-
unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.4.0';
435-
436432
like(http_get('/content_length_keys'), qr/B:true/, 'Content-Length in keys');
437433
like(http_get('/content_length_arr'), qr/Content-Length: 3/,
438434
'set Content-Length arr');
@@ -465,8 +461,6 @@ like(http_get('/hdr_out_set_cookie'), qr/B:\['c','d','f']/,
465461
unlike(http_get('/hdr_out_set_cookie'), qr/Set-Cookie: [abe]/,
466462
'set_cookie3');
467463

468-
}
469-
470464
like(http(
471465
'GET /hdr_in HTTP/1.0' . CRLF
472466
. 'Cookie: foo' . CRLF
@@ -507,10 +501,6 @@ like(http(
507501
. 'Host: localhost' . CRLF . CRLF
508502
), qr/content-type: bar1(?!,\s?bar2)/, 'r.headersIn duplicate single 2');
509503

510-
TODO: {
511-
local $TODO = 'not yet'
512-
unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.4.1';
513-
514504
like(http(
515505
'GET /hdr_in HTTP/1.0' . CRLF
516506
. 'Foo: bar1' . CRLF
@@ -527,8 +517,6 @@ like(http(
527517

528518
like(http_get('/raw_hdr_out?filter=a'), qr/raw: foo|bar/, 'r.rawHeadersOut');
529519

530-
}
531-
532520
like(http(
533521
'GET /hdr_sorted_keys?in=1 HTTP/1.0' . CRLF
534522
. 'Cookie: foo1' . CRLF

js_ngx.t

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ $t->try_run('no njs ngx')->plan(3);
8181

8282
###############################################################################
8383

84-
TODO: {
85-
local $TODO = 'not yet'
86-
unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
87-
8884
http_get('/log?level=INFO&text=FOO');
8985
http_get('/log?level=WARN&text=BAR');
9086
http_get('/log?level=ERR&text=BAZ');
@@ -95,6 +91,4 @@ like($t->read_file('error.log'), qr/\[info\].*ngx.log:FOO/, 'ngx.log info');
9591
like($t->read_file('error.log'), qr/\[warn\].*ngx.log:BAR/, 'ngx.log warn');
9692
like($t->read_file('error.log'), qr/\[error\].*ngx.log:BAZ/, 'ngx.log err');
9793

98-
}
99-
10094
###############################################################################

js_promise.t

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,6 @@ $t->try_run('no njs available')->plan(4);
196196
like(http_get('/promise'), qr/{"token": "b"}/, "Promise");
197197
like(http_get('/promise_throw'), qr/{"token": "x"}/, "Promise throw and catch");
198198
like(http_get('/timeout'), qr/{"token": "R"}/, "Promise with timeout");
199-
200-
TODO: {
201-
local $TODO = 'not yet'
202-
unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
203-
204199
like(http_get('/promise_pure'), qr/200 OK/, "events handling");
205-
}
206-
207-
$t->todo_alerts() unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
208200

209201
###############################################################################

js_subrequests.t

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -542,15 +542,9 @@ is(get_json('/sr_unavail_pr'), '[{"status":502,"uri":"/unavail"}]',
542542
like(http_get('/sr_detached_in_variable_handler'), qr/subrequest_var/,
543543
'sr_detached_in_variable_handler');
544544

545-
TODO: {
546-
todo_skip 'leaves coredump', 1 unless $ENV{TEST_NGINX_UNSAFE}
547-
or http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
548-
549545
like(http_get('/sr_error_page'), qr/reply\.status:404/,
550546
'sr_error_page');
551547

552-
}
553-
554548
http_get('/sr_broken');
555549
http_get('/sr_in_sr');
556550
http_get('/sr_in_variable_handler');

0 commit comments

Comments
 (0)