-
Notifications
You must be signed in to change notification settings - Fork 30k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
test: add hijackStdout and hijackStderr #13439
Changes from 5 commits
82dd2c2
d261893
bda1fd1
5a3a666
ab93f52
2a42456
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -116,6 +116,14 @@ Checks whether `IPv6` is supported on this platform. | |
|
||
Checks if there are multiple localhosts available. | ||
|
||
### hijackStderr/Stdout(listener) | ||
* `listener` [<Function>][MDN-Function]: a listener with a single parameter called `data`. | ||
|
||
Eavesdrop to `process.stderr.write` or `process.stdout.write` calls. Once | ||
`process.std*.write` is called, `listener` will also be called and the `data` of | ||
`write` function will be passed to `listener`. What's more, | ||
`process.std*.writeTimes` is a count of the number of calls. | ||
|
||
### inFreeBSDJail | ||
* return [<Boolean>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type) | ||
|
||
|
@@ -250,6 +258,14 @@ Port tests are running on. | |
|
||
Deletes the 'tmp' dir and recreates it | ||
|
||
### restoreStderr | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If these are functions, then please include the |
||
|
||
Restore the original `process.stderr.write`. | ||
|
||
### restoreStdout | ||
|
||
Restore the original `process.stdout.write`. | ||
|
||
### rootDir | ||
* return [<String>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type) | ||
|
||
|
@@ -290,3 +306,5 @@ Node.js | |
[WHATWG URL API](https://nodejs.org/api/url.html#url_the_whatwg_url_api) | ||
implementation with tests from | ||
[W3C Web Platform Tests](https://github.com/w3c/web-platform-tests). | ||
|
||
[MDN-Function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Normal_objects_and_functions |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -759,3 +759,27 @@ exports.getTTYfd = function getTTYfd() { | |
} | ||
return tty_fd; | ||
}; | ||
|
||
// Hijack stdout and stderr | ||
const stdWrite = {}; | ||
function hijackStdWritable(name, listener) { | ||
const stream = process[name]; | ||
const _write = stdWrite[name] = stream.write; | ||
|
||
stream.writeTimes = 0; | ||
stream.write = function(data, callback) { | ||
listener(data); | ||
_write.call(stream, data, callback); | ||
stream.writeTimes++; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This logic seem not go well with the writable.write specification:
Your logic will cause:
I propose: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👌 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In fact, And I've added the |
||
}; | ||
} | ||
|
||
function restoreWritable(name) { | ||
process[name].write = stdWrite[name]; | ||
delete process[name].writeTimes; | ||
} | ||
|
||
exports.hijackStdout = hijackStdWritable.bind(null, 'stdout'); | ||
exports.hijackStderr = hijackStdWritable.bind(null, 'stderr'); | ||
exports.restoreStdout = restoreWritable.bind(null, 'stdout'); | ||
exports.restoreStderr = restoreWritable.bind(null, 'stderr'); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,16 +45,14 @@ assert.doesNotThrow(function() { | |
// an Object with a custom .inspect() function | ||
const custom_inspect = { foo: 'bar', inspect: () => 'inspect' }; | ||
|
||
const stdout_write = global.process.stdout.write; | ||
const stderr_write = global.process.stderr.write; | ||
const strings = []; | ||
const errStrings = []; | ||
global.process.stdout.write = function(string) { | ||
strings.push(string); | ||
}; | ||
global.process.stderr.write = function(string) { | ||
errStrings.push(string); | ||
}; | ||
common.hijackStdout(function(data) { | ||
strings.push(data); | ||
}); | ||
common.hijackStderr(function(data) { | ||
errStrings.push(data); | ||
}); | ||
|
||
// test console.log() goes to stdout | ||
console.log('foo'); | ||
|
@@ -105,8 +103,10 @@ console.timeEnd('constructor'); | |
console.time('hasOwnProperty'); | ||
console.timeEnd('hasOwnProperty'); | ||
|
||
global.process.stdout.write = stdout_write; | ||
global.process.stderr.write = stderr_write; | ||
assert.strictEqual(strings.length, process.stdout.writeTimes); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. won't this fail after you implemented @gireeshpunathil's async comment? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In fact, I just added the |
||
assert.strictEqual(errStrings.length, process.stderr.writeTimes); | ||
common.restoreStdout(); | ||
common.restoreStderr(); | ||
|
||
// verify that console.timeEnd() doesn't leave dead links | ||
const timesMapSize = console._times.size; | ||
|
@@ -146,9 +146,6 @@ assert.ok(/^hasOwnProperty: \d+\.\d{3}ms$/.test(strings.shift().trim())); | |
assert.strictEqual('Trace: This is a {"formatted":"trace"} 10 foo', | ||
errStrings.shift().split('\n').shift()); | ||
|
||
assert.strictEqual(strings.length, 0); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keep this. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same which mentioned before. And |
||
assert.strictEqual(errStrings.length, 0); | ||
|
||
assert.throws(() => { | ||
console.assert(false, 'should throw'); | ||
}, common.expectsError({ | ||
|
@@ -159,3 +156,14 @@ assert.throws(() => { | |
assert.doesNotThrow(() => { | ||
console.assert(true, 'this should not throw'); | ||
}); | ||
|
||
// hijack stderr to catch `process.emitWarning` which is using | ||
// `process.nextTick` | ||
common.hijackStderr(common.mustCall(function(data) { | ||
common.restoreStderr(); | ||
|
||
// stderr.write will catch sync error, so use `process.nextTick` here | ||
process.nextTick(function() { | ||
assert.strictEqual(data.includes('no such label'), true); | ||
}); | ||
})); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be listed as separate functions (even if it means duplicating the text)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jasnell I suggested the the merge (since it's an internal guide) #13439 (comment)
Please 👍 / 👎 again, just so we don't ask @XadillaX to do unnecessary work
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather keep the style consistent throughout, so would really prefer them separate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ack.
Sorry @XadillaX
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👌