From f26cabbe249ae6e095736ef65bd925fb82c4908c Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 11 Dec 2017 03:56:41 -0200 Subject: [PATCH] test: fix wrong error classes passed in as type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/13686 Fixes: https://github.com/nodejs/node/issues/13682 Reviewed-By: James M Snell Reviewed-By: Michaël Zasso --- test/parallel/test-crypto-sign-verify.js | 4 ++-- test/parallel/test-fs-timestamp-parsing-error.js | 4 ++-- test/parallel/test-http2-client-http1-server.js | 7 +++++-- test/parallel/test-http2-client-onconnect-errors.js | 5 ++++- test/parallel/test-http2-info-headers-errors.js | 5 ++++- test/parallel/test-http2-misbehaving-multiplex.js | 4 +++- test/parallel/test-http2-respond-errors.js | 5 ++++- test/parallel/test-http2-respond-with-fd-errors.js | 5 ++++- test/parallel/test-http2-server-http1-client.js | 4 +++- test/parallel/test-http2-server-push-stream-errors.js | 5 ++++- test/parallel/test-internal-errors.js | 6 +++++- test/parallel/test-ttywrap-invalid-fd.js | 7 +++++-- 12 files changed, 45 insertions(+), 16 deletions(-) diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js index abdbcd3a1e5..48b21d0d85a 100644 --- a/test/parallel/test-crypto-sign-verify.js +++ b/test/parallel/test-crypto-sign-verify.js @@ -36,7 +36,7 @@ common.expectsError( }, ''), { code: 'ERR_INVALID_OPT_VALUE', - type: Error, + type: TypeError, message: 'The value "undefined" is invalid for option "padding"' }); @@ -47,7 +47,7 @@ common.expectsError( }, ''), { code: 'ERR_INVALID_OPT_VALUE', - type: Error, + type: TypeError, message: 'The value "undefined" is invalid for option "saltLength"' }); diff --git a/test/parallel/test-fs-timestamp-parsing-error.js b/test/parallel/test-fs-timestamp-parsing-error.js index 3680b5fece1..a0dac1bf6d3 100644 --- a/test/parallel/test-fs-timestamp-parsing-error.js +++ b/test/parallel/test-fs-timestamp-parsing-error.js @@ -10,7 +10,7 @@ const assert = require('assert'); }, { code: 'ERR_INVALID_ARG_TYPE', - type: Error + type: TypeError }); }); @@ -20,7 +20,7 @@ common.expectsError( }, { code: 'ERR_INVALID_ARG_TYPE', - type: Error + type: TypeError }); const okInputs = [1, -1, '1', '-1', Date.now()]; diff --git a/test/parallel/test-http2-client-http1-server.js b/test/parallel/test-http2-client-http1-server.js index 616427b3904..c7535adcef2 100644 --- a/test/parallel/test-http2-client-http1-server.js +++ b/test/parallel/test-http2-client-http1-server.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); if (!common.hasCrypto) @@ -6,6 +7,7 @@ if (!common.hasCrypto) const http = require('http'); const http2 = require('http2'); +const { NghttpError } = require('internal/http2/util'); // Creating an http1 server here... const server = http.createServer(common.mustNotCall()); @@ -18,13 +20,14 @@ server.listen(0, common.mustCall(() => { req.on('error', common.expectsError({ code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, message: 'Protocol error' })); client.on('error', common.expectsError({ code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, + name: 'Error [ERR_HTTP2_ERROR]', message: 'Protocol error' })); diff --git a/test/parallel/test-http2-client-onconnect-errors.js b/test/parallel/test-http2-client-onconnect-errors.js index 44fe6875602..901caf18d91 100644 --- a/test/parallel/test-http2-client-onconnect-errors.js +++ b/test/parallel/test-http2-client-onconnect-errors.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); if (!common.hasCrypto) @@ -10,6 +11,7 @@ const { nghttp2ErrorString } = process.binding('http2'); const http2 = require('http2'); +const { NghttpError } = require('internal/http2/util'); // tests error handling within requestOnConnect // - NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE (should emit session error) @@ -51,7 +53,8 @@ const genericTests = Object.getOwnPropertyNames(constants) ngError: constants[key], error: { code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, + name: 'Error [ERR_HTTP2_ERROR]', message: nghttp2ErrorString(constants[key]) }, type: 'session' diff --git a/test/parallel/test-http2-info-headers-errors.js b/test/parallel/test-http2-info-headers-errors.js index 1df76334558..230a1328ed1 100644 --- a/test/parallel/test-http2-info-headers-errors.js +++ b/test/parallel/test-http2-info-headers-errors.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); if (!common.hasCrypto) @@ -9,6 +10,7 @@ const { Http2Stream, nghttp2ErrorString } = process.binding('http2'); +const { NghttpError } = require('internal/http2/util'); // tests error handling within additionalHeaders // - every other NGHTTP2 error from binding (should emit stream error) @@ -24,7 +26,8 @@ const genericTests = Object.getOwnPropertyNames(constants) ngError: constants[key], error: { code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, + name: 'Error [ERR_HTTP2_ERROR]', message: nghttp2ErrorString(constants[key]) }, type: 'stream' diff --git a/test/parallel/test-http2-misbehaving-multiplex.js b/test/parallel/test-http2-misbehaving-multiplex.js index 7d5a7a2f552..aba1721a562 100644 --- a/test/parallel/test-http2-misbehaving-multiplex.js +++ b/test/parallel/test-http2-misbehaving-multiplex.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); @@ -7,6 +8,7 @@ if (!common.hasCrypto) const h2 = require('http2'); const net = require('net'); +const { NghttpError } = require('internal/http2/util'); const h2test = require('../common/http2'); let client; @@ -18,7 +20,7 @@ server.on('stream', common.mustCall((stream) => { server.on('session', common.mustCall((session) => { session.on('error', common.expectsError({ code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, message: 'Stream was already closed or invalid' })); })); diff --git a/test/parallel/test-http2-respond-errors.js b/test/parallel/test-http2-respond-errors.js index 2a48456c939..5ec953c5442 100644 --- a/test/parallel/test-http2-respond-errors.js +++ b/test/parallel/test-http2-respond-errors.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); if (!common.hasCrypto) @@ -9,6 +10,7 @@ const { Http2Stream, nghttp2ErrorString } = process.binding('http2'); +const { NghttpError } = require('internal/http2/util'); // tests error handling within respond // - every other NGHTTP2 error from binding (should emit stream error) @@ -25,7 +27,8 @@ const genericTests = Object.getOwnPropertyNames(constants) ngError: constants[key], error: { code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, + name: 'Error [ERR_HTTP2_ERROR]', message: nghttp2ErrorString(constants[key]) }, type: 'stream' diff --git a/test/parallel/test-http2-respond-with-fd-errors.js b/test/parallel/test-http2-respond-with-fd-errors.js index 0b215134663..99a5273df3c 100644 --- a/test/parallel/test-http2-respond-with-fd-errors.js +++ b/test/parallel/test-http2-respond-with-fd-errors.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); @@ -14,6 +15,7 @@ const { Http2Stream, nghttp2ErrorString } = process.binding('http2'); +const { NghttpError } = require('internal/http2/util'); // tests error handling within processRespondWithFD // (called by respondWithFD & respondWithFile) @@ -32,7 +34,8 @@ const genericTests = Object.getOwnPropertyNames(constants) ngError: constants[key], error: { code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, + name: 'Error [ERR_HTTP2_ERROR]', message: nghttp2ErrorString(constants[key]) }, type: 'stream' diff --git a/test/parallel/test-http2-server-http1-client.js b/test/parallel/test-http2-server-http1-client.js index 34a8f48b5e1..394993d4d72 100644 --- a/test/parallel/test-http2-server-http1-client.js +++ b/test/parallel/test-http2-server-http1-client.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); @@ -7,6 +8,7 @@ if (!common.hasCrypto) const http = require('http'); const http2 = require('http2'); +const { NghttpError } = require('internal/http2/util'); const server = http2.createServer(); server.on('stream', common.mustNotCall()); @@ -14,7 +16,7 @@ server.on('session', common.mustCall((session) => { session.on('close', common.mustCall()); session.on('error', common.expectsError({ code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, message: 'Received bad client magic byte string' })); })); diff --git a/test/parallel/test-http2-server-push-stream-errors.js b/test/parallel/test-http2-server-push-stream-errors.js index 7eaf4dc94d1..a6d2fe12782 100644 --- a/test/parallel/test-http2-server-push-stream-errors.js +++ b/test/parallel/test-http2-server-push-stream-errors.js @@ -1,4 +1,5 @@ 'use strict'; +// Flags: --expose-internals const common = require('../common'); if (!common.hasCrypto) @@ -9,6 +10,7 @@ const { Http2Stream, nghttp2ErrorString } = process.binding('http2'); +const { NghttpError } = require('internal/http2/util'); // tests error handling within pushStream // - NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE (should emit session error) @@ -49,7 +51,8 @@ const genericTests = Object.getOwnPropertyNames(constants) ngError: constants[key], error: { code: 'ERR_HTTP2_ERROR', - type: Error, + type: NghttpError, + name: 'Error [ERR_HTTP2_ERROR]', message: nghttp2ErrorString(constants[key]) }, type: 'stream' diff --git a/test/parallel/test-internal-errors.js b/test/parallel/test-internal-errors.js index 3673749224e..e2d297eaf78 100644 --- a/test/parallel/test-internal-errors.js +++ b/test/parallel/test-internal-errors.js @@ -163,7 +163,11 @@ assert.doesNotThrow(() => { assert.doesNotThrow(() => { common.expectsError(() => { throw new errors.TypeError('TEST_ERROR_1', 'a'); - }, { code: 'TEST_ERROR_1', type: Error }); + }, { + code: 'TEST_ERROR_1', + type: TypeError, + message: 'Error for testing purposes: a' + }); }); common.expectsError(() => { diff --git a/test/parallel/test-ttywrap-invalid-fd.js b/test/parallel/test-ttywrap-invalid-fd.js index ad7a98da346..6564d47fd93 100644 --- a/test/parallel/test-ttywrap-invalid-fd.js +++ b/test/parallel/test-ttywrap-invalid-fd.js @@ -1,7 +1,10 @@ 'use strict'; +// Flags: --expose-internals + const common = require('../common'); const fs = require('fs'); const tty = require('tty'); +const { SystemError } = require('internal/errors'); common.expectsError( () => new tty.WriteStream(-1), @@ -27,7 +30,7 @@ common.expectsError( new tty.WriteStream(fd); }, { code: 'ERR_SYSTEM_ERROR', - type: Error, + type: SystemError, message } ); @@ -42,7 +45,7 @@ common.expectsError( new tty.ReadStream(fd); }, { code: 'ERR_SYSTEM_ERROR', - type: Error, + type: SystemError, message }); }