From 419e88ea4a78116076bce90e5c8bf25f054e9be5 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 21 Mar 2018 22:42:35 -0700
Subject: [PATCH] lib,test: lint fixes for linter upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 lib/_http_client.js                     |  1 +
 lib/internal/readline.js                |  2 +
 lib/internal/util.js                    |  2 +-
 test/parallel/test-require-nul.js       |  2 +
 test/parallel/test-tls-client-verify.js | 50 ++++++++++++-------------
 5 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/lib/_http_client.js b/lib/_http_client.js
index 71d81cd64dd58c..7ba4d27e85b1b5 100644
--- 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
index 979e62090b3b1d..5d7cbd32f362b3 100644
--- 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
index 0241573fa818c8..e95dcd209b952c 100644
--- 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
index 0c5cb7018d47fc..7756a2d4e2db1e 100644
--- 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
index 83b9142dea9266..3abcd3c16345ef 100644
--- 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) {