Skip to content

Commit a784d6f

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 <[email protected]>
1 parent c5a157c commit a784d6f

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
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
@@ -76,8 +76,8 @@ assert.equal('foo bar\n', strings.shift());
7676
assert.equal('foo bar hop\n', strings.shift());
7777
assert.equal("{ slashes: '\\\\\\\\' }\n", strings.shift());
7878
assert.equal('inspect\n', strings.shift());
79-
assert.equal("{ foo: 'bar', inspect: [Function] }\n", strings.shift());
80-
assert.equal("{ foo: 'bar', inspect: [Function] }\n", strings.shift());
79+
assert.equal("{ foo: 'bar', inspect: [Function: inspect] }\n", strings.shift());
80+
assert.equal("{ foo: 'bar', inspect: [Function: inspect] }\n", strings.shift());
8181
assert.notEqual(-1, strings.shift().indexOf('foo: [Object]'));
8282
assert.equal(-1, strings.shift().indexOf('baz'));
8383
assert.equal('Trace: This is a {"formatted":"trace"} 10 foo',

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: 2 additions & 2 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: /^SyntaxError: Unexpected eval or arguments in strict mode/ },
179179
{ client: client_unix, send: '(function() { "use strict"; if (true) function f() { } })()',
180-
expect: /^SyntaxError: In strict mode code, functions can only be declared at top level or immediately within another function/ },
180+
expect: /^SyntaxError: 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: /^SyntaxError: Unexpected token ILLEGAL/ },
231+
expect: /^SyntaxError: 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 +

test/parallel/test-util-inspect.js

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

2525
assert.equal(util.inspect({}), '{}');
2626
assert.equal(util.inspect({a: 1}), '{ a: 1 }');
27-
assert.equal(util.inspect({a: function() {}}), '{ a: [Function] }');
27+
assert.equal(util.inspect({a: function() {}}), '{ a: [Function: a] }');
2828
assert.equal(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
2929
assert.equal(util.inspect({'a': {}}), '{ a: {} }');
3030
assert.equal(util.inspect({'a': {'b': 2}}), '{ a: { b: 2 } }');
@@ -212,7 +212,7 @@ assert.equal(util.inspect(value), '[ 1, 2, 3, growingLength: [Getter] ]');
212212
// Function with properties
213213
value = function() {};
214214
value.aprop = 42;
215-
assert.equal(util.inspect(value), '{ [Function] aprop: 42 }');
215+
assert.equal(util.inspect(value), '{ [Function: value] aprop: 42 }');
216216

217217
// Regular expressions with properties
218218
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)