Mercurial > hg > nginx-tests
changeset 1315:890516ca898a
Tests: reverted 3882f8f3b2bc to unbreak with njs 0.1.15.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 02 Apr 2018 19:47:17 +0300 |
parents | b6d941ff65f4 |
children | d51cc2526066 |
files | js.t stream_js.t |
diffstat | 2 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/js.t +++ b/js.t @@ -178,9 +178,7 @@ EOF } function test_log(req, res) { - req.log("SEE-THIS-LOG"); - req.warn("SEE-THIS-WARN"); - req.error("SEE-THIS-ERROR"); + req.log("SEE-THIS"); } function test_except(req, res) { @@ -263,7 +261,7 @@ EOF EOF -$t->try_run('no njs available')->plan(24); +$t->try_run('no njs available')->plan(22); ############################################################################### @@ -304,9 +302,7 @@ like(http_get('/res_ihdr'), qr/\x0d\x0a? $t->stop(); -ok(index($t->read_file('error.log'), 'SEE-THIS-LOG') > 0, 'log js'); -ok(index($t->read_file('error.log'), 'SEE-THIS-WARN') > 0, 'warn js'); -ok(index($t->read_file('error.log'), 'SEE-THIS-ERROR') > 0, 'error js'); +ok(index($t->read_file('error.log'), 'SEE-THIS') > 0, 'log js'); ok(index($t->read_file('error.log'), 'at fs.readFileSync') > 0, 'js_set backtrace'); ok(index($t->read_file('error.log'), 'at JSON.parse') > 0,
--- a/stream_js.t +++ b/stream_js.t @@ -133,9 +133,7 @@ EOF } function js_log(sess) { - sess.log("SEE-THIS-LOG"); - sess.warn("SEE-THIS-WARN"); - sess.error("SEE-THIS-ERROR"); + sess.log("SEE-THIS"); } function js_access_allow(sess) { @@ -201,7 +199,7 @@ EOF EOF $t->run_daemon(\&stream_daemon, port(8090)); -$t->try_run('no stream njs available')->plan(16); +$t->try_run('no stream njs available')->plan(14); $t->waitforsocket('127.0.0.1:' . port(8090)); ############################################################################### @@ -225,9 +223,7 @@ stream('127.0.0.1:' . port(8093))->io('x $t->stop(); -ok(index($t->read_file('error.log'), 'SEE-THIS-LOG') > 0, 'stream js log'); -ok(index($t->read_file('error.log'), 'SEE-THIS-WARN') > 0, 'stream js warn'); -ok(index($t->read_file('error.log'), 'SEE-THIS-ERROR') > 0, 'stream js error'); +ok(index($t->read_file('error.log'), 'SEE-THIS') > 0, 'stream js log'); ok(index($t->read_file('error.log'), 'at fs.readFileSync') > 0, 'stream js_preread backtrace'); ok(index($t->read_file('error.log'), 'at js_filter_except') > 0,