Skip to content

Commit cda8bfc

Browse files
committed
test: fix tests after V8 upgrade
* Changes to messages. * V8 enabled proxy support by default. The --harmony_proxies flag is now gone. PR-URL: #6482 Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
1 parent 66e66e5 commit cda8bfc

7 files changed

+11
-11
lines changed

test/parallel/test-child-process-fork-exec-argv.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (process.argv[2] === 'fork') {
1212
} else if (process.argv[2] === 'child') {
1313
fork(__filename, ['fork']);
1414
} else {
15-
var execArgv = ['--harmony_proxies', '--stack-size=256'];
15+
var execArgv = ['--stack-size=256'];
1616
var args = [__filename, 'child', 'arg0'];
1717

1818
var child = spawn(process.execPath, execArgv.concat(args));

test/parallel/test-console.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ for (const expected of expectedStrings) {
111111
assert.equal(expected + '\n', errStrings.shift()); // console.warn (stderr)
112112
}
113113

114-
assert.equal("{ foo: 'bar', inspect: [Function] }\n", strings.shift());
115-
assert.equal("{ foo: 'bar', inspect: [Function] }\n", strings.shift());
114+
assert.equal("{ foo: 'bar', inspect: [Function: inspect] }\n", strings.shift());
115+
assert.equal("{ foo: 'bar', inspect: [Function: inspect] }\n", strings.shift());
116116
assert.notEqual(-1, strings.shift().indexOf('foo: [Object]'));
117117
assert.equal(-1, strings.shift().indexOf('baz'));
118118
assert.ok(/^label: \d+\.\d{3}ms$/.test(strings.shift().trim()));

test/parallel/test-process-exec-argv.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var spawn = require('child_process').spawn;
66
if (process.argv[2] === 'child') {
77
process.stdout.write(JSON.stringify(process.execArgv));
88
} else {
9-
var execArgv = ['--harmony_proxies', '--stack-size=256'];
9+
var execArgv = ['--stack-size=256'];
1010
var args = [__filename, 'child', 'arg0'];
1111
var child = spawn(process.execPath, execArgv.concat(args));
1212
var out = '';

test/parallel/test-repl.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ function error_test() {
177177
{ client: client_unix, send: '(function() { "use strict"; eval = 17; })()',
178178
expect: /\bSyntaxError: Unexpected eval or arguments in strict mode/ },
179179
{ client: client_unix, send: '(function() { "use strict"; if (true) function f() { } })()',
180-
expect: /\bSyntaxError: In strict mode code, functions can only be declared at top level or immediately within another function/ },
180+
expect: /\bSyntaxError: In strict mode code, functions can only be declared at top level or inside a block./ },
181181
// Named functions can be used:
182182
{ client: client_unix, send: 'function blah() { return 1; }',
183183
expect: prompt_unix },
@@ -228,7 +228,7 @@ function error_test() {
228228
expect: 'Invalid REPL keyword\n' + prompt_unix },
229229
// fail when we are not inside a String and a line continuation is used
230230
{ client: client_unix, send: '[] \\',
231-
expect: /\bSyntaxError: Unexpected token ILLEGAL/ },
231+
expect: /\bSyntaxError: Invalid or unexpected token/ },
232232
// do not fail when a String is created with line continuation
233233
{ client: client_unix, send: '\'the\\\nfourth\\\neye\'',
234234
expect: prompt_multiline + prompt_multiline +
@@ -327,7 +327,7 @@ function error_test() {
327327
// Illegal token is not recoverable outside string literal, RegExp literal,
328328
// or block comment. https://github.com/nodejs/node/issues/3611
329329
{ client: client_unix, send: 'a = 3.5e',
330-
expect: /\bSyntaxError: Unexpected token ILLEGAL/ },
330+
expect: /\bSyntaxError: Invalid or unexpected token/ },
331331
// Mitigate https://github.com/nodejs/node/issues/548
332332
{ client: client_unix, send: 'function name(){ return "node"; };name()',
333333
expect: "'node'\n" + prompt_unix },

test/parallel/test-util-inspect-proxy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ assert.strictEqual(target, details[0]);
2222
assert.strictEqual(handler, details[1]);
2323

2424
assert.strictEqual(util.inspect(proxyObj, opts),
25-
'Proxy [ {}, { get: [Function] } ]');
25+
'Proxy [ {}, { get: [Function: get] } ]');
2626

2727
// Using getProxyDetails with non-proxy returns undefined
2828
assert.strictEqual(processUtil.getProxyDetails({}), undefined);

test/parallel/test-util-inspect.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ assert.equal(util.inspect([1, [2, 3]]), '[ 1, [ 2, 3 ] ]');
2525

2626
assert.equal(util.inspect({}), '{}');
2727
assert.equal(util.inspect({a: 1}), '{ a: 1 }');
28-
assert.equal(util.inspect({a: function() {}}), '{ a: [Function] }');
28+
assert.equal(util.inspect({a: function() {}}), '{ a: [Function: a] }');
2929
assert.equal(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
3030
assert.equal(util.inspect({'a': {}}), '{ a: {} }');
3131
assert.equal(util.inspect({'a': {'b': 2}}), '{ a: { b: 2 } }');
@@ -225,7 +225,7 @@ assert.equal(util.inspect(value), '[ 1, 2, 3, growingLength: [Getter] ]');
225225
// Function with properties
226226
value = function() {};
227227
value.aprop = 42;
228-
assert.equal(util.inspect(value), '{ [Function] aprop: 42 }');
228+
assert.equal(util.inspect(value), '{ [Function: value] aprop: 42 }');
229229

230230
// Regular expressions with properties
231231
value = /123/ig;

test/parallel/test-util-log.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var tests = [
1919
{input: null, output: 'null'},
2020
{input: false, output: 'false'},
2121
{input: 42, output: '42'},
22-
{input: function() {}, output: '[Function]'},
22+
{input: function() {}, output: '[Function: input]'},
2323
{input: parseInt('not a number', 10), output: 'NaN'},
2424
{input: {answer: 42}, output: '{ answer: 42 }'},
2525
{input: [1, 2, 3], output: '[ 1, 2, 3 ]'}

0 commit comments

Comments
 (0)