Browse Source

tools,test: make argument linting more stringent

The custom linting rule for argument alignment in multi-line function
calls previously ignored template strings in an effort to avoid false
positives. This isn't really necessary. Enforce for template strings and
adjust whitespace in three tests to abide. (Insert "The test abides"
joke of your choosing here.)

PR-URL: https://github.com/nodejs/node/pull/6720
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v7.x
Rich Trott 9 years ago
parent
commit
d73e189c26
  1. 2
      test/parallel/test-assert.js
  2. 2
      test/parallel/test-net-pipe-connect-errors.js
  3. 28
      test/parallel/test-tick-processor.js
  4. 1
      tools/eslint-rules/align-function-arguments.js

2
test/parallel/test-assert.js

@ -376,7 +376,7 @@ try {
} catch (e) {
threw = true;
assert(e instanceof AnotherErrorType,
`expected AnotherErrorType, received ${e}`);
`expected AnotherErrorType, received ${e}`);
}
assert.ok(threw);

2
test/parallel/test-net-pipe-connect-errors.js

@ -45,7 +45,7 @@ var notSocketClient = net.createConnection(emptyTxt, function() {
notSocketClient.on('error', function(err) {
assert(err.code === 'ENOTSOCK' || err.code === 'ECONNREFUSED',
`received ${err.code} instead of ENOTSOCK or ECONNREFUSED`);
`received ${err.code} instead of ENOTSOCK or ECONNREFUSED`);
notSocketErrorFired = true;
});

28
test/parallel/test-tick-processor.js

@ -19,14 +19,14 @@ process.chdir(common.tmpDir);
// Unknown checked for to prevent flakiness, if pattern is not found,
// then a large number of unknown ticks should be present
runTest(/LazyCompile.*\[eval\]:1|.*% UNKNOWN/,
`function f() {
for (var i = 0; i < 1000000; i++) {
i++;
}
setImmediate(function() { f(); });
};
setTimeout(function() { process.exit(0); }, 2000);
f();`);
`function f() {
for (var i = 0; i < 1000000; i++) {
i++;
}
setImmediate(function() { f(); });
};
setTimeout(function() { process.exit(0); }, 2000);
f();`);
if (common.isWindows ||
common.isSunOS ||
common.isAix ||
@ -36,12 +36,12 @@ if (common.isWindows ||
return;
}
runTest(/RunInDebugContext/,
`function f() {
require(\'vm\').runInDebugContext(\'Debug\');
setImmediate(function() { f(); });
};
setTimeout(function() { process.exit(0); }, 2000);
f();`);
`function f() {
require(\'vm\').runInDebugContext(\'Debug\');
setImmediate(function() { f(); });
};
setTimeout(function() { process.exit(0); }, 2000);
f();`);
function runTest(pattern, code) {
cp.execFileSync(process.execPath, ['-prof', '-pe', code]);

1
tools/eslint-rules/align-function-arguments.js

@ -33,7 +33,6 @@ function checkArgumentAlignment(context, node) {
'CallExpression',
'FunctionExpression',
'ObjectExpression',
'TemplateLiteral'
];
const args = node.arguments;

Loading…
Cancel
Save