diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2018-03-21 00:46:30 +0800 |
---|---|---|
committer | Joyee Cheung <joyeec9h3@gmail.com> | 2018-04-05 04:46:26 +0800 |
commit | 7d06761f839bbff8c671b0e1a6d541faa5452354 (patch) | |
tree | 0e7b375cd841c9a66f8c08cffe4b03d2f6c60277 /test/parallel/test-ttywrap-invalid-fd.js | |
parent | 3e0d40d4af6f437ecacb8b54d0d84ed0e5a4899f (diff) | |
download | node-new-7d06761f839bbff8c671b0e1a6d541faa5452354.tar.gz |
errors: improve SystemError messages
This commit improves the SystemError messages by allowing user
to combine a custom message and the libuv error message. Also
since we now prefer use subclasses to construct the errors instead
of using `new errors.SystemError()` directly, this removes
the behavior of assigning a default error code `ERR_SYSTEM_ERROR`
to SystemError and requires the user to directly use the
`ERR_SYSTEM_ERROR` class to construct errors instead.
Also merges `makeNodeError` into the SystemError class definition
since that's the only place the function gets used and it seems
unnecessary to introduce another level of inheritance. SystemError
now directly inherits from Error instead of an intermmediate Error
class that inherits from Error.
Class hierarchy before this patch:
ERR_SOCKET_BUFFER_SIZE -> Error (use message formatted by SystemError)
ERR_SYSTEM_ERROR -> NodeError (temp) -> Error
After:
ERR_SOCKET_BUFFER_SIZE -> SystemError -> Error
ERR_TTY_INIT_FAILED -> SystemError -> Error
ERR_SYSTEM_ERROR -> SystemError -> Error
Error messages before this patch:
```
const dgram = require('dgram');
const socket = dgram.createSocket('udp4');
socket.setRecvBufferSize(8192);
// Error [ERR_SOCKET_BUFFER_SIZE]: Could not get or set buffer
// size: Error [ERR_SYSTEM_ERROR]: bad file descriptor:
// EBADF [uv_recv_buffer_size]
// at bufferSize (dgram.js:191:11)
// at Socket.setRecvBufferSize (dgram.js:689:3)
const tty = require('tty');
new tty.WriteStream(1 << 30);
// Error [ERR_SYSTEM_ERROR]: invalid argument: EINVAL [uv_tty_init]
// at new WriteStream (tty.js:84:11)
```
After:
```
const dgram = require('dgram');
const socket = dgram.createSocket('udp4');
socket.setRecvBufferSize(8192);
// SystemError [ERR_SOCKET_BUFFER_SIZE]: Could not get or set buffer
// size: uv_recv_buffer_size returned EBADF (bad file descriptor)
// at bufferSize (dgram.js:191:11)
// at Socket.setRecvBufferSize (dgram.js:689:3)
const tty = require('tty');
new tty.WriteStream(1 << 30);
// SystemError [ERR_TTY_INIT_FAILED]: TTY initialization failed:
// uv_tty_init returned EINVAL (invalid argument)
// at new WriteStream (tty.js:84:11)
```
PR-URL: https://github.com/nodejs/node/pull/19514
Reviewed-By: Michaƫl Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test/parallel/test-ttywrap-invalid-fd.js')
-rw-r--r-- | test/parallel/test-ttywrap-invalid-fd.js | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/test/parallel/test-ttywrap-invalid-fd.js b/test/parallel/test-ttywrap-invalid-fd.js index adf88cbde6..c360489cb3 100644 --- a/test/parallel/test-ttywrap-invalid-fd.js +++ b/test/parallel/test-ttywrap-invalid-fd.js @@ -4,6 +4,7 @@ const common = require('../common'); const tty = require('tty'); const { SystemError } = require('internal/errors'); +const uv = process.binding('uv'); common.expectsError( () => new tty.WriteStream(-1), @@ -15,9 +16,16 @@ common.expectsError( ); { - const message = common.isWindows ? - 'bad file descriptor: EBADF [uv_tty_init]' : - 'invalid argument: EINVAL [uv_tty_init]'; + const info = { + code: common.isWindows ? 'EBADF' : 'EINVAL', + message: common.isWindows ? 'bad file descriptor' : 'invalid argument', + errno: common.isWindows ? uv.UV_EBADF : uv.UV_EINVAL, + syscall: 'uv_tty_init' + }; + + const suffix = common.isWindows ? + 'EBADF (bad file descriptor)' : 'EINVAL (invalid argument)'; + const message = `TTY initialization failed: uv_tty_init returned ${suffix}`; common.expectsError( () => { @@ -25,9 +33,10 @@ common.expectsError( new tty.WriteStream(fd); }); }, { - code: 'ERR_SYSTEM_ERROR', + code: 'ERR_TTY_INIT_FAILED', type: SystemError, - message + message, + info } ); @@ -37,9 +46,10 @@ common.expectsError( new tty.ReadStream(fd); }); }, { - code: 'ERR_SYSTEM_ERROR', + code: 'ERR_TTY_INIT_FAILED', type: SystemError, - message + message, + info }); } |