Mercurial > hg > nginx-tests
comparison js.t @ 1811:520fb74cce4c
Tests: improved njs version check to account multi digit versions.
author | Dmitry Volyntsev <xeioex@nginx.com> |
---|---|
date | Fri, 02 Dec 2022 17:46:22 -0800 |
parents | 7cf848422b28 |
children |
comparison
equal
deleted
inserted
replaced
1810:7cf848422b28 | 1811:520fb74cce4c |
---|---|
299 like(http_get('/var'), qr/variable=127.0.0.1/, 'r.variables'); | 299 like(http_get('/var'), qr/variable=127.0.0.1/, 'r.variables'); |
300 like(http_get('/global'), qr/global=njs/, 'global code'); | 300 like(http_get('/global'), qr/global=njs/, 'global code'); |
301 like(http_get('/log'), qr/200 OK/, 'r.log'); | 301 like(http_get('/log'), qr/200 OK/, 'r.log'); |
302 | 302 |
303 TODO: { | 303 TODO: { |
304 local $TODO = 'not yet' | 304 local $TODO = 'not yet' unless has_version('0.7.7'); |
305 unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.7.7'; | |
306 | 305 |
307 like(http_get('/internal'), qr/parent: false sub: true/, 'r.internal'); | 306 like(http_get('/internal'), qr/parent: false sub: true/, 'r.internal'); |
308 | 307 |
309 } | 308 } |
310 | 309 |
319 ok(index($t->read_file('error.log'), 'SEE-LOG') > 0, 'log js'); | 318 ok(index($t->read_file('error.log'), 'SEE-LOG') > 0, 'log js'); |
320 ok(index($t->read_file('error.log'), 'at fs.readFileSync') > 0, | 319 ok(index($t->read_file('error.log'), 'at fs.readFileSync') > 0, |
321 'js_set backtrace'); | 320 'js_set backtrace'); |
322 ok(index($t->read_file('error.log'), 'at JSON.parse') > 0, | 321 ok(index($t->read_file('error.log'), 'at JSON.parse') > 0, |
323 'js_content backtrace'); | 322 'js_content backtrace'); |
323 | |
324 ############################################################################### | |
325 | |
326 sub has_version { | |
327 my $need = shift; | |
328 | |
329 http_get('/njs') =~ /^([.0-9]+)$/m; | |
330 | |
331 my @v = split(/\./, $1); | |
332 my ($n, $v); | |
333 | |
334 for $n (split(/\./, $need)) { | |
335 $v = shift @v || 0; | |
336 return 0 if $n > $v; | |
337 return 1 if $v > $n; | |
338 } | |
339 | |
340 return 1; | |
341 } | |
324 | 342 |
325 ############################################################################### | 343 ############################################################################### |
326 | 344 |
327 sub http_get_hdr { | 345 sub http_get_hdr { |
328 my ($url, %extra) = @_; | 346 my ($url, %extra) = @_; |