Skip to content

Commit f29762f

Browse files
committed
test: enable linting for tests
Enable linting for the test directory. A number of changes was made so all tests conform the current rules used by lib and src directories. The only exception for tests is that unreachable (dead) code is allowed. test-fs-non-number-arguments-throw had to be excluded from the changes because of a weird issue on Windows CI. PR-URL: #1721 Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 85d9983 commit f29762f

File tree

985 files changed

+2278
-1125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

985 files changed

+2278
-1125
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
lib/punycode.js
2+
test/fixtures
3+
test/**/node_modules
4+
test/parallel/test-fs-non-number-arguments-throw.js

.eslintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ecmaFeatures:
88
octalLiterals: true
99
binaryLiterals: true
1010
generators: true
11+
forOf: true
1112

1213
rules:
1314
# Possible Errors
@@ -54,6 +55,10 @@ rules:
5455
space-infix-ops: 2
5556
## require spaces return, throw, case
5657
space-return-throw-case: 2
58+
## no space before function, eg. 'function()'
59+
space-before-function-paren: [2, "never"]
60+
## require space before blocks, eg 'function() {'
61+
space-before-blocks: [2, "always"]
5762
## require parens for Constructor
5863
new-parens: 2
5964
## max 80 length

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ bench-idle:
375375
./$(NODE_EXE) benchmark/idle_clients.js &
376376

377377
jslint:
378-
./$(NODE_EXE) tools/eslint/bin/eslint.js src lib --reset --quiet
378+
./$(NODE_EXE) tools/eslint/bin/eslint.js src lib test --reset --quiet
379379

380380
CPPLINT_EXCLUDE ?=
381381
CPPLINT_EXCLUDE += src/node_lttng.cc

test/.eslintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Test-specific linter rules
2+
3+
rules:
4+
## allow unreachable code
5+
no-unreachable: 0

test/addons/async-hello-world/test.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
'use strict';
12
var assert = require('assert');
23
var binding = require('./build/Release/binding');
34
var called = false;
45

5-
process.on('exit', function () {
6+
process.on('exit', function() {
67
assert(called);
78
});
89

9-
binding(5, function (err, val) {
10+
binding(5, function(err, val) {
1011
assert.equal(null, err);
1112
assert.equal(10, val);
12-
process.nextTick(function () {
13+
process.nextTick(function() {
1314
called = true;
1415
});
1516
});

test/addons/at-exit/test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
'use strict';
12
var binding = require('./build/Release/binding');

test/addons/hello-world-function-export/test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var assert = require('assert');
23
var binding = require('./build/Release/binding');
34
assert.equal('world', binding());

test/addons/hello-world/test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var assert = require('assert');
23
var binding = require('./build/Release/binding');
34
assert.equal('world', binding.hello());

test/addons/repl-domain-abort/test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var assert = require('assert');
23
var repl = require('repl');
34
var stream = require('stream');

test/addons/smalloc-alloc/test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var assert = require('assert');
23
var binding = require('./build/Release/binding');
34
var obj = binding.alloc(16);

test/common.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var path = require('path');
23
var fs = require('fs');
34
var assert = require('assert');
@@ -107,8 +108,8 @@ if (process.env.NODE_COMMON_PIPE) {
107108
if (process.platform === 'win32') {
108109
exports.faketimeCli = false;
109110
} else {
110-
exports.faketimeCli = path.join(__dirname, "..", "tools", "faketime", "src",
111-
"faketime");
111+
exports.faketimeCli = path.join(__dirname, '..', 'tools', 'faketime', 'src',
112+
'faketime');
112113
}
113114

114115
var ifaces = os.networkInterfaces();
@@ -307,7 +308,7 @@ exports.mustCall = function(fn, expected) {
307308
var context = {
308309
expected: expected,
309310
actual: 0,
310-
stack: (new Error).stack,
311+
stack: (new Error()).stack,
311312
name: fn.name || '<anonymous>'
312313
};
313314

@@ -345,11 +346,11 @@ if (process.platform === 'win32') {
345346
*/
346347
exports.getServiceName = function getServiceName(port, protocol) {
347348
if (port == null) {
348-
throw new Error("Missing port number");
349+
throw new Error('Missing port number');
349350
}
350351

351352
if (typeof protocol !== 'string') {
352-
throw new Error("Protocol must be a string");
353+
throw new Error('Protocol must be a string');
353354
}
354355

355356
/*
@@ -360,10 +361,10 @@ exports.getServiceName = function getServiceName(port, protocol) {
360361

361362
try {
362363
/*
363-
* I'm not a big fan of readFileSync, but reading /etc/services asynchronously
364-
* here would require implementing a simple line parser, which seems overkill
365-
* for a simple utility function that is not running concurrently with any
366-
* other one.
364+
* I'm not a big fan of readFileSync, but reading /etc/services
365+
* asynchronously here would require implementing a simple line parser,
366+
* which seems overkill for a simple utility function that is not running
367+
* concurrently with any other one.
367368
*/
368369
var servicesContent = fs.readFileSync(etcServicesFileName,
369370
{ encoding: 'utf8'});
@@ -380,7 +381,7 @@ exports.getServiceName = function getServiceName(port, protocol) {
380381
}
381382

382383
return serviceName;
383-
}
384+
};
384385

385386
exports.hasMultiLocalhost = function hasMultiLocalhost() {
386387
var TCP = process.binding('tcp_wrap').TCP;
@@ -397,7 +398,7 @@ exports.isValidHostname = function(str) {
397398
'(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*$');
398399

399400
return !!str.match(re) && str.length <= 255;
400-
}
401+
};
401402

402403
exports.fileExists = function(pathname) {
403404
try {

test/debugger/helper-debugger-repl.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
process.env.NODE_DEBUGGER_TIMEOUT = 2000;
23
var common = require('../common');
34
var assert = require('assert');
@@ -55,7 +56,7 @@ function startDebugger(scriptToDebug) {
5556
quitCalled = true;
5657
child.stdin.write('quit');
5758
child.kill('SIGTERM');
58-
}
59+
};
5960

6061
setTimeout(function() {
6162
console.error('dying badly buffer=%j', buffer);

test/debugger/test-debug-break-on-uncaught.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var path = require('path');
23
var assert = require('assert');
34
var spawn = require('child_process').spawn;
@@ -44,7 +45,7 @@ function runScenario(scriptName, throwsInFile, throwsOnLine, next) {
4445
child.on('close', function() {
4546
assert(asserted, 'debugger did not pause on exception');
4647
if (next) next();
47-
})
48+
});
4849

4950
var exceptions = [];
5051

test/debugger/test-debugger-client.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
process.env.NODE_DEBUGGER_TIMEOUT = 2000;
23
var common = require('../common');
34
var assert = require('assert');
@@ -66,7 +67,7 @@ var d = 'Content-Length: 466\r\n\r\n' +
6667
'{"seq":10,"type":"event","event":"afterCompile","success":true,' +
6768
'"body":{"script":{"handle":1,"type":"script","name":"dns.js",' +
6869
'"id":34,"lineOffset":0,"columnOffset":0,"lineCount":241,' +
69-
'"sourceStart":"(function (module, exports, require) {' +
70+
'"sourceStart":"(function(module, exports, require) {' +
7071
'var dns = process.binding(\'cares\')' +
7172
';\\nvar ne","sourceLength":6137,"scriptType":2,"compilationType":0,' +
7273
'"context":{"ref":0},"text":"dns.js (lines: 241)"}},"refs":' +
@@ -127,8 +128,8 @@ addTest(function(client, done) {
127128

128129

129130
var connectCount = 0;
130-
var script = 'setTimeout(function () { console.log("blah"); });' +
131-
'setInterval(function () {}, 1000000);';
131+
var script = 'setTimeout(function() { console.log("blah"); });' +
132+
'setInterval(function() {}, 1000000);';
132133

133134
var nodeProcess;
134135

test/debugger/test-debugger-debug-brk.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var spawn = require('child_process').spawn;

test/debugger/test-debugger-remote.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var spawn = require('child_process').spawn;

test/debugger/test-debugger-repl-break-in-module.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var repl = require('./helper-debugger-repl.js');
23

34
repl.startDebugger('break-in-module/main.js');

test/debugger/test-debugger-repl-restart.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var repl = require('./helper-debugger-repl.js');
23

34
repl.startDebugger('breakpoints.js');
@@ -7,7 +8,7 @@ var linesWithBreakpoint = [
78
// We slice here, because addTest will change the given array.
89
repl.addTest('sb(6)', linesWithBreakpoint.slice());
910

10-
var initialLines = repl.initialLines.slice()
11+
var initialLines = repl.initialLines.slice();
1112
initialLines.splice(2, 0, /Restoring/, /Warning/);
1213

1314
// Restart the debugged script

test/debugger/test-debugger-repl-term.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
process.env.NODE_FORCE_READLINE = 1;
23

34
var repl = require('./helper-debugger-repl.js');

test/debugger/test-debugger-repl-utf8.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var script = common.fixturesDir + '/breakpoints_utf8.js';
34
process.env.NODE_DEBUGGER_TEST_SCRIPT = script;

test/debugger/test-debugger-repl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var repl = require('./helper-debugger-repl.js');
23

34
repl.startDebugger('breakpoints.js');

test/disabled/GH-670.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var https = require('https');

test/disabled/test-cat.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common.js');
23
var assert = require('assert');
34
var http = require('http');

test/disabled/test-child-process-custom-fds.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-child-process-customfd-bounded.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23

34
var bigish = Array(200);

test/disabled/test-child-process-uid-gid.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var spawn = require('child_process').spawn;

test/disabled/test-debug-brk-file.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var spawn = require('child_process').spawn;

test/disabled/test-debug-brk-no-arg.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var spawn = require('child_process').spawn;

test/disabled/test-dgram-multicast.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-dgram-send-error.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
// Some operating systems report errors when an UDP message is sent to an
23
// unreachable host. This error can be reported by sendto() and even by
34
// recvfrom(). Node should not propagate this error to the user.

test/disabled/test-dgram-unix-anon.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-dgram-unix.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-eio-race.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

@@ -36,7 +37,7 @@ function tryToKillEventLoop() {
3637

3738
// Generate a lot of thread pool events
3839
var pos = 0;
39-
fs.open(filename, 'r', 0666, function(err, fd) {
40+
fs.open(filename, 'r', 0o666, function(err, fd) {
4041
if (err) throw err;
4142

4243
function readChunk() {

test/disabled/test-eio-race2.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var path = require('path');

test/disabled/test-eio-race3.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
/* XXX Can this test be modified to not call the now-removed wait()? */
23

34
var common = require('../common');

test/disabled/test-eio-race4.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var fs = require('fs');

test/disabled/test-fs-largefile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var path = require('path'),

test/disabled/test-http-abort-stream-end.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-http-agent2.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var http = require('http');

test/disabled/test-http-big-proxy-responses.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34
var util = require('util'),

test/disabled/test-http-head-request.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-http-stress.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

test/disabled/test-http-tls.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var common = require('../common');
23
var assert = require('assert');
34

0 commit comments

Comments
 (0)