test: fix wrong error classes passed in as type

PR-URL: https://github.com/nodejs/node/pull/13686
Fixes: https://github.com/nodejs/node/issues/13682
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
Ruben Bridgewater 2017-12-11 03:56:41 -02:00
parent 22760f31be
commit f26cabbe24
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
12 changed files with 45 additions and 16 deletions

View File

@ -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"'
});

View File

@ -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()];

View File

@ -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'
}));

View File

@ -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'

View File

@ -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'

View File

@ -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'
}));
}));

View File

@ -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'

View File

@ -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'

View File

@ -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'
}));
}));

View File

@ -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'

View File

@ -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(() => {

View File

@ -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
});
}