1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib,test: lint fixes for linter upgrade

Browse Source 
ESLint 4.19.1 fixes some bugs in rules. These changes prepare us for the
upgrade.

PR-URL: https://github.com/nodejs/node/pull/19528
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Rich Trott 2018-03-21 22:42:35 -07:00
parent 7921e53ac5
commit 5e00a013eb
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/internal/readline.js
View File

@ -4,8 +4,10 @@
// Adopted from https://github.com/chalk/ansi-regex/blob/master/index.js // Adopted from https://github.com/chalk/ansi-regex/blob/master/index.js
// License: MIT, authors: @sindresorhus, Qix-, and arjunmehta // License: MIT, authors: @sindresorhus, Qix-, and arjunmehta
// Matches all ansi escape code sequences in a string // Matches all ansi escape code sequences in a string
/* eslint-disable no-control-regex */
const ansi = const ansi =
/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
/* eslint-enable no-control-regex */
const kEscape = '\x1b'; const kEscape = '\x1b';

2
lib/internal/util.js
View File

@ -22,7 +22,7 @@ const noCrypto = !process.versions.openssl;
const experimentalWarnings = new Set(); const experimentalWarnings = new Set();
const colorRegExp = /\u001b\[\d\d?m/g; const colorRegExp = /\u001b\[\d\d?m/g; // eslint-disable-line no-control-regex
function removeColors(str) { function removeColors(str) {
return str.replace(colorRegExp, ''); return str.replace(colorRegExp, '');

2
test/parallel/test-require-nul.js
View File

@ -4,6 +4,8 @@ require('../common');
const assert = require('assert'); const assert = require('assert');
// Nul bytes should throw, not abort. // Nul bytes should throw, not abort.
/* eslint-disable no-control-regex */
assert.throws(() => require('\u0000ab'), /Cannot find module '\u0000ab'/); assert.throws(() => require('\u0000ab'), /Cannot find module '\u0000ab'/);
assert.throws(() => require('a\u0000b'), /Cannot find module 'a\u0000b'/); assert.throws(() => require('a\u0000b'), /Cannot find module 'a\u0000b'/);
assert.throws(() => require('ab\u0000'), /Cannot find module 'ab\u0000'/); assert.throws(() => require('ab\u0000'), /Cannot find module 'ab\u0000'/);
/* eslint-enable no-control-regex */

48
test/parallel/test-tls-client-verify.js
View File

@ -28,37 +28,37 @@ const assert = require('assert');
const tls = require('tls'); const tls = require('tls');
const fixtures = require('../common/fixtures'); const fixtures = require('../common/fixtures');
const testCases = const testCases = [
[{ ca: ['ca1-cert'], { ca: ['ca1-cert'],
key: 'agent2-key', key: 'agent2-key',
cert: 'agent2-cert', cert: 'agent2-cert',
servers: [ servers: [
{ ok: true, key: 'agent1-key', cert: 'agent1-cert' }, { ok: true, key: 'agent1-key', cert: 'agent1-cert' },
{ ok: false, key: 'agent2-key', cert: 'agent2-cert' }, { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
{ ok: false, key: 'agent3-key', cert: 'agent3-cert' } { ok: false, key: 'agent3-key', cert: 'agent3-cert' }
] ]
}, },
{ ca: [], { ca: [],
key: 'agent2-key', key: 'agent2-key',
cert: 'agent2-cert', cert: 'agent2-cert',
servers: [ servers: [
{ ok: false, key: 'agent1-key', cert: 'agent1-cert' }, { ok: false, key: 'agent1-key', cert: 'agent1-cert' },
{ ok: false, key: 'agent2-key', cert: 'agent2-cert' }, { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
{ ok: false, key: 'agent3-key', cert: 'agent3-cert' } { ok: false, key: 'agent3-key', cert: 'agent3-cert' }
] ]
}, },
{ ca: ['ca1-cert', 'ca2-cert'], { ca: ['ca1-cert', 'ca2-cert'],
key: 'agent2-key', key: 'agent2-key',
cert: 'agent2-cert', cert: 'agent2-cert',
servers: [ servers: [
{ ok: true, key: 'agent1-key', cert: 'agent1-cert' }, { ok: true, key: 'agent1-key', cert: 'agent1-cert' },
{ ok: false, key: 'agent2-key', cert: 'agent2-cert' }, { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
{ ok: true, key: 'agent3-key', cert: 'agent3-cert' } { ok: true, key: 'agent3-key', cert: 'agent3-cert' }
] ]
} }
]; ];
function loadPEM(n) { function loadPEM(n) {