From ac64375cf96588591ab4375313b578cdb24e18d7 Mon Sep 17 00:00:00 2001 From: Mark Abel Date: Thu, 23 Aug 2018 11:15:01 -0700 Subject: [PATCH 1/3] added common.restoreStderr(); to end of file bb29405904 lib,src: fix consistent spacing inside braces 76340e3f10 test: fix RegExp nits d00e5f1a04 test: add hijackStdout and hijackStderr 98e54b0bd4 meta: restore original copyright header 3d2aef3979 test: s/assert.equal/assert.strictEqual/ 7a0e462f9f test: use eslint to fix var->const/let ff1efa6087 test: use const for all require() calls 9940766f8a test: fix tests after V8 upgrade d1aabd6264 test: fix style issues after eslint update 02fe8215f0 test: load common.js to test for global leaks e3f9335c40 tools: re-enable comma-spacing linter rule f29762f4dd test: enable linting for tests 3e1b1dd4a9 Remove excessive copyright/license boilerplate 0e19476595 test: split test in parallel/sequential Fixes: https://github.com/nodejs/node/issues/22472 --- test/parallel/test-util-log.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-util-log.js b/test/parallel/test-util-log.js index 4d81fc8f7a4255..2dce3be5c8b98d 100644 --- a/test/parallel/test-util-log.js +++ b/test/parallel/test-util-log.js @@ -62,4 +62,5 @@ tests.forEach(function(test) { assert.strictEqual(process.stdout.writeTimes, tests.length); -restoreStdout(); +common.restoreStdout(); +common.restoreStderr(); \ No newline at end of file From 6396adf8cd38e2b5812b1583225f1a04372c2f34 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 24 Aug 2018 18:34:46 -0700 Subject: [PATCH 2/3] squash! add newline --- test/parallel/test-util-log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-util-log.js b/test/parallel/test-util-log.js index 2dce3be5c8b98d..b543cacd06d690 100644 --- a/test/parallel/test-util-log.js +++ b/test/parallel/test-util-log.js @@ -63,4 +63,4 @@ tests.forEach(function(test) { assert.strictEqual(process.stdout.writeTimes, tests.length); common.restoreStdout(); -common.restoreStderr(); \ No newline at end of file +common.restoreStderr(); From 2f56db27ab0f0d3db08669635237cb6d742eeaca Mon Sep 17 00:00:00 2001 From: Denys Otrishko Date: Tue, 18 Sep 2018 15:03:12 +0300 Subject: [PATCH 3/3] fixup! fix restoreStderr, restoreStdout require --- test/parallel/test-util-log.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-util-log.js b/test/parallel/test-util-log.js index b543cacd06d690..3de79b835d85a3 100644 --- a/test/parallel/test-util-log.js +++ b/test/parallel/test-util-log.js @@ -25,6 +25,7 @@ const { hijackStdout, hijackStderr, restoreStdout, + restoreStderr, } = require('../common/hijackstdio'); const assert = require('assert'); const util = require('util'); @@ -62,5 +63,5 @@ tests.forEach(function(test) { assert.strictEqual(process.stdout.writeTimes, tests.length); -common.restoreStdout(); -common.restoreStderr(); +restoreStdout(); +restoreStderr();