lib,test: lint fixes for linter upgrade

ESLint 4.19.1 fixes some bugs in rules. These changes prepare us for the upgrade. PR-URL: #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>
nodejs · Mar 27, 2018 · 419e88e · 419e88e
1 parent ae0e243
commit 419e88e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 26 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -121,6 +121,7 @@ function ClientRequest(options, cb) {
     if (path.length <= 39) { // Determined experimentally in V8 5.4
       invalidPath = isInvalidPath(path);
     } else {
+      // eslint-disable-next-line no-control-regex
       invalidPath = /[\u0000-\u0020]/.test(path);
     }
     if (invalidPath)

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

diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -12,7 +12,7 @@ const noCrypto = !process.versions.openssl;
 
 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) {
   return str.replace(colorRegExp, '');

diff --git a/test/parallel/test-require-nul.js b/test/parallel/test-require-nul.js
@@ -4,6 +4,8 @@ require('../common');
 const assert = require('assert');
 
 // Nul bytes should throw, not abort.
+/* eslint-disable no-control-regex */
 assert.throws(() => require('\u0000ab'), /Cannot find module '\u0000ab'/);
 assert.throws(() => require('a\u0000b'), /Cannot find module 'a\u0000b'/);
 assert.throws(() => require('ab\u0000'), /Cannot find module 'ab\u0000'/);
+/* eslint-enable no-control-regex */
diff --git a/test/parallel/test-tls-client-verify.js b/test/parallel/test-tls-client-verify.js
@@ -28,37 +28,37 @@ const assert = require('assert');
 const tls = require('tls');
 const fixtures = require('../common/fixtures');
 
-const testCases =
-  [{ ca: ['ca1-cert'],
-     key: 'agent2-key',
-     cert: 'agent2-cert',
-     servers: [
+const testCases = [
+  { ca: ['ca1-cert'],
+    key: 'agent2-key',
+    cert: 'agent2-cert',
+    servers: [
       { ok: true, key: 'agent1-key', cert: 'agent1-cert' },
       { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
       { ok: false, key: 'agent3-key', cert: 'agent3-cert' }
     ]
   },
 
-   { ca: [],
-     key: 'agent2-key',
-     cert: 'agent2-cert',
-     servers: [
-       { ok: false, key: 'agent1-key', cert: 'agent1-cert' },
-       { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
-       { ok: false, key: 'agent3-key', cert: 'agent3-cert' }
-     ]
-   },
-
-   { ca: ['ca1-cert', 'ca2-cert'],
-     key: 'agent2-key',
-     cert: 'agent2-cert',
-     servers: [
-       { ok: true, key: 'agent1-key', cert: 'agent1-cert' },
-       { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
-       { ok: true, key: 'agent3-key', cert: 'agent3-cert' }
-     ]
-   }
-  ];
+  { ca: [],
+    key: 'agent2-key',
+    cert: 'agent2-cert',
+    servers: [
+      { ok: false, key: 'agent1-key', cert: 'agent1-cert' },
+      { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
+      { ok: false, key: 'agent3-key', cert: 'agent3-cert' }
+    ]
+  },
+
+  { ca: ['ca1-cert', 'ca2-cert'],
+    key: 'agent2-key',
+    cert: 'agent2-cert',
+    servers: [
+      { ok: true, key: 'agent1-key', cert: 'agent1-cert' },
+      { ok: false, key: 'agent2-key', cert: 'agent2-cert' },
+      { ok: true, key: 'agent3-key', cert: 'agent3-cert' }
+    ]
+  }
+];
 
 
 function loadPEM(n) {