Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(v6.x backport) tools: use no-useless-concat ESLint rule #13056

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ rules:
no-self-assign: 2
no-unused-labels: 2
no-useless-call: 2
no-useless-concat: 2
no-useless-escape: 2
no-void: 2
no-with: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,10 @@ function createTestCmdLine(options) {
testCmd += process.argv[0];

if (options && options.withAbortOnUncaughtException) {
testCmd += ' ' + '--abort-on-uncaught-exception';
testCmd += ' --abort-on-uncaught-exception';
}

testCmd += ' ' + process.argv[1];
testCmd += ' ' + 'child';
testCmd += ` ${process.argv[1]} child`;

return testCmd;
}
4 changes: 2 additions & 2 deletions test/parallel/test-http-server-unconsume-consume.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const http = require('http');

const testServer = http.createServer(common.mustNotCall());
testServer.on('connect', common.mustCall((req, socket, head) => {
socket.write('HTTP/1.1 200 Connection Established' + '\r\n' +
'Proxy-agent: Node-Proxy' + '\r\n' +
socket.write('HTTP/1.1 200 Connection Established\r\n' +
'Proxy-agent: Node-Proxy\r\n' +
'\r\n');
// This shouldn't raise an assertion in StreamBase::Consume.
testServer.emit('connection', socket);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-set-trailers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let outstanding_reqs = 0;
const server = http.createServer(function(req, res) {
res.writeHead(200, [['content-type', 'text/plain']]);
res.addTrailers({'x-foo': 'bar'});
res.end('stuff' + '\n');
res.end('stuff\n');
});
server.listen(0);

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-net-write-connect-write.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ const server = net.createServer(function(socket) {
conn.setEncoding('utf8');
conn.write('before');
conn.on('connect', function() {
conn.write('after');
conn.write(' after');
});
conn.on('data', function(buf) {
received += buf;
conn.end();
});
conn.on('end', common.mustCall(function() {
server.close();
assert.strictEqual(received, 'before' + 'after');
assert.strictEqual(received, 'before after');
}));
}));
6 changes: 3 additions & 3 deletions test/parallel/test-preload.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ interactive.stdin.write('a\n');
interactive.stdin.write('process.exit()\n');

childProcess.exec(
nodeBinary + ' ' + '--require ' + fixture('cluster-preload.js') + ' ' +
`${nodeBinary} --require ${fixture('cluster-preload.js')} ` +
fixture('cluster-preload-test.js'),
function(err, stdout, stderr) {
if (err) throw err;
Expand All @@ -139,8 +139,8 @@ childProcess.exec(
// https://github.com/nodejs/node/issues/1691
process.chdir(common.fixturesDir);
childProcess.exec(
nodeBinary + ' ' + '--expose_natives_as=v8natives ' + '--require ' +
fixture('cluster-preload.js') + ' ' + 'cluster-preload-test.js',
`${nodeBinary} --expose_natives_as=v8natives --require ` +
`${fixture('cluster-preload.js')} cluster-preload-test.js`,
function(err, stdout, stderr) {
if (err) throw err;
assert.ok(/worker terminated with code 43/.test(stdout));
Expand Down
14 changes: 7 additions & 7 deletions test/parallel/test-repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,12 @@ function tcp_test() {
{ client: client_tcp, send: '',
expect: prompt_tcp },
{ client: client_tcp, send: 'invoke_me(333)',
expect: ('\'' + 'invoked 333' + '\'\n' + prompt_tcp) },
expect: (`'invoked 333'\n${prompt_tcp}`) },
{ client: client_tcp, send: 'a += 1',
expect: ('12346' + '\n' + prompt_tcp) },
expect: (`12346\n${prompt_tcp}`) },
{ client: client_tcp,
send: 'require(' + JSON.stringify(moduleFilename) + ').number',
expect: ('42' + '\n' + prompt_tcp) }
expect: (`42\n${prompt_tcp}`) }
]);
});

Expand Down Expand Up @@ -483,13 +483,13 @@ function unix_test() {
{ client: client_unix, send: '',
expect: prompt_unix },
{ client: client_unix, send: 'message',
expect: ('\'' + message + '\'\n' + prompt_unix) },
expect: (`'${message}'\n${prompt_unix}`) },
{ client: client_unix, send: 'invoke_me(987)',
expect: ('\'' + 'invoked 987' + '\'\n' + prompt_unix) },
expect: (`'invoked 987'\n${prompt_unix}`) },
{ client: client_unix, send: 'a = 12345',
expect: ('12345' + '\n' + prompt_unix) },
expect: (`12345\n${prompt_unix}`) },
{ client: client_unix, send: '{a:1}',
expect: ('{ a: 1 }' + '\n' + prompt_unix) }
expect: (`{ a: 1 }\n${prompt_unix}`) }
]);
});

Expand Down
7 changes: 2 additions & 5 deletions test/sequential/test-domain-abort-on-uncaught.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,8 @@ if (process.argv[2] === 'child') {
testCmd += 'ulimit -c 0 && ';
}

testCmd += process.argv[0];
testCmd += ' ' + '--abort-on-uncaught-exception';
testCmd += ' ' + process.argv[1];
testCmd += ' ' + 'child';
testCmd += ' ' + testIndex;
testCmd += `${process.argv[0]} --abort-on-uncaught-exception ` +
`${process.argv[1]} child ${testIndex}`;

const child = child_process.exec(testCmd);

Expand Down