Skip to content

Commit

Permalink
tools: re-enable comma-spacing linter rule
Browse files Browse the repository at this point in the history
The rule was disabled because of an eslint bug which is now resolved.
All code in lib was already conforming and only test code needed a few
changes to make the linter happy with this rule enabled.

Ref: eslint/eslint#2408

PR-URL: #2072
Reviewed-By: Yosuke Furukawa <[email protected]>
Reviewed-by: Colin Ihrig <[email protected]>
Reviewed-By: Alex Kocharin <[email protected]>
  • Loading branch information
silverwind committed Jun 29, 2015
1 parent d91e10b commit e3f9335
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 18 deletions.
3 changes: 1 addition & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ rules:
## 2 space indentation
indent: [2, 2]
## add space after comma
## set to 'warn' because of https://github.com/eslint/eslint/issues/2408
comma-spacing: 1
comma-spacing: 2
## put semi-colon
semi: 2
## require spaces operator like var sum = 1 + 1;
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-dgram-oob-buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var assert = require('assert');
var dgram = require('dgram');

var socket = dgram.createSocket('udp4');
var buf = Buffer([1,2,3,4]);
var buf = Buffer([1, 2, 3, 4]);

function ok() {}
socket.send(buf, 0, 0, common.PORT, '127.0.0.1', ok); // useful? no
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-domain-http-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var http = require('http');
var assert = require('assert');
var common = require('../common');

var objects = { foo: 'bar', baz: {}, num: 42, arr: [1,2,3] };
var objects = { foo: 'bar', baz: {}, num: 42, arr: [1, 2, 3] };
objects.baz.asdf = objects;

var serverCaught = 0;
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-fs-mkdir.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ common.refreshTmpDir();

unlink(pathname);

fs.mkdir(pathname, 511 /*=0777*/, function(err) {
fs.mkdir(pathname, 0o777, function(err) {
assert.equal(err, null);
assert.equal(common.fileExists(pathname), true);
ncalls++;
Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-http-server-multiheaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ srv.listen(common.PORT, function() {
['www-authenticate', 'foo'],
['WWW-Authenticate', 'bar'],
['WWW-AUTHENTICATE', 'baz'],
['proxy-authenticate','foo'],
['Proxy-Authenticate','bar'],
['PROXY-AUTHENTICATE','baz'],
['proxy-authenticate', 'foo'],
['Proxy-Authenticate', 'bar'],
['PROXY-AUTHENTICATE', 'baz'],
['x-foo', 'bingo'],
['x-bar', 'banjo'],
['x-bar', 'bango'],
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-sys.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ assert.equal('{ readonly: [Getter] }',
common.inspect({get readonly() {}}));

assert.equal('{ readwrite: [Getter/Setter] }',
common.inspect({get readwrite() {},set readwrite(val) {}}));
common.inspect({get readwrite() {}, set readwrite(val) {}}));

assert.equal('{ writeonly: [Setter] }',
common.inspect({set writeonly(val) {}}));
Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-tls-npn-server-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ var clientsOptions = [{
crl: serverOptions.crl,
NPNProtocols: ['a', 'b', 'c'],
rejectUnauthorized: false
},{
}, {
port: serverPort,
key: serverOptions.key,
cert: serverOptions.cert,
crl: serverOptions.crl,
NPNProtocols: ['c', 'b', 'e'],
rejectUnauthorized: false
},{
}, {
port: serverPort,
key: serverOptions.key,
cert: serverOptions.cert,
crl: serverOptions.crl,
rejectUnauthorized: false
},{
}, {
port: serverPort,
key: serverOptions.key,
cert: serverOptions.cert,
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-tls-session-cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ if (!common.hasCrypto) {
process.exit();
}

doTest({ tickets: false } , function() {
doTest({ tickets: true } , function() {
doTest({ tickets: false }, function() {
doTest({ tickets: true }, function() {
console.error('all done');
});
});
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-util-log.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var tests = [
{input: function() {}, output: '[Function]'},
{input: parseInt('not a number', 10), output: 'NaN'},
{input: {answer: 42}, output: '{ answer: 42 }'},
{input: [1,2,3], output: '[ 1, 2, 3 ]'}
{input: [1, 2, 3], output: '[ 1, 2, 3 ]'}
];

// test util.log()
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-zlib-dictionary-fail.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var zlib = require('zlib');
}));

// String "test" encoded with dictionary "dict".
stream.write(Buffer([0x78,0xBB,0x04,0x09,0x01,0xA5]));
stream.write(Buffer([0x78, 0xBB, 0x04, 0x09, 0x01, 0xA5]));
})();

// Should raise an error, not trigger an assertion in src/node_zlib.cc
Expand All @@ -24,5 +24,5 @@ var zlib = require('zlib');
}));

// String "test" encoded with dictionary "dict".
stream.write(Buffer([0x78,0xBB,0x04,0x09,0x01,0xA5]));
stream.write(Buffer([0x78, 0xBB, 0x04, 0x09, 0x01, 0xA5]));
})();
2 changes: 1 addition & 1 deletion test/sequential/test-tls-honorcipherorder.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ test1();

function test1() {
// Client has the preference of cipher suites by default
test(false, 'AES256-SHA:DES-CBC-SHA:RC4-SHA','AES256-SHA', test2);
test(false, 'AES256-SHA:DES-CBC-SHA:RC4-SHA', 'AES256-SHA', test2);
}

function test2() {
Expand Down

0 comments on commit e3f9335

Please sign in to comment.