From dad3deb356d0049a2782f1976fc19cc9e545634d Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 23 Mar 2019 09:29:19 -0700
Subject: [PATCH 1/4] test: move test-https-connect-localport to sequential

test-https-connect-localport uses a hard-coded port number. Therefore
the test cannot be in the parallel directory because it will sometimes
conflict with other tests that run at the same time and request that the
OS provide an available port.

Fixes: https://github.com/nodejs/node/issues/26862
---
 test/{parallel => sequential}/test-https-connect-localport.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{parallel => sequential}/test-https-connect-localport.js (100%)

diff --git a/test/parallel/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
similarity index 100%
rename from test/parallel/test-https-connect-localport.js
rename to test/sequential/test-https-connect-localport.js

From 0afa99b66b45281aac4d1346e26bb0cb5f6f93e3 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 23 Mar 2019 09:35:09 -0700
Subject: [PATCH 2/4] test: use common.PORT instead of hardcoded number

In sequential/test-https-connect-localport, replace 34567 with
common.PORT.
---
 test/sequential/test-https-connect-localport.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index fc9e11f27e7188..d703d2813cd01a 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -22,10 +22,10 @@ const assert = require('assert');
       pathname: '/',
       port,
       family: 4,
-      localPort: 34567,
+      localPort: common.PORT,
       rejectUnauthorized: false
     }, common.mustCall(() => {
-      assert.strictEqual(req.socket.localPort, 34567);
+      assert.strictEqual(req.socket.localPort, common.PORT);
       assert.strictEqual(req.socket.remotePort, port);
     }));
   }));

From 5348b10dc29de764bf3f1a680eca8a8ace26910d Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 23 Mar 2019 09:37:32 -0700
Subject: [PATCH 3/4] test: replace localhost IP with 'localhost' for TLS
 conformity

test-https-connect-localport currently causes a runtime deprecation
warning: "[DEP0123] DeprecationWarning: Setting the TLS ServerName
to an IP address is not permitted by RFC 6066. This will be ignored
in a future version."

Change IP usage to the string 'localhost' instead.
---
 test/sequential/test-https-connect-localport.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index d703d2813cd01a..67b56c7d7d6b80 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -15,10 +15,10 @@ const assert = require('assert');
   }, common.mustCall(function(req, res) {
     this.close();
     res.end();
-  })).listen(0, common.localhostIPv4, common.mustCall(function() {
+  })).listen(0, 'localhost', common.mustCall(function() {
     const port = this.address().port;
     const req = https.get({
-      host: common.localhostIPv4,
+      host: 'localhost',
       pathname: '/',
       port,
       family: 4,

From 277ede3b9e6ebcbae196339147f44da14a279b21 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 23 Mar 2019 09:42:30 -0700
Subject: [PATCH 4/4] test: refactor test-https-connect-localport

Use arrow functions for callbacks. Replace uses of `this` with explicit
variables. Add a trailing comma in a multiline object literal
declaration.
---
 test/sequential/test-https-connect-localport.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index 67b56c7d7d6b80..e703fb2287d369 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -9,21 +9,23 @@ const https = require('https');
 const assert = require('assert');
 
 {
-  https.createServer({
+  const server = https.createServer({
     cert: fixtures.readKey('agent1-cert.pem'),
     key: fixtures.readKey('agent1-key.pem'),
-  }, common.mustCall(function(req, res) {
-    this.close();
+  }, common.mustCall((req, res) => {
+    server.close();
     res.end();
-  })).listen(0, 'localhost', common.mustCall(function() {
-    const port = this.address().port;
+  }));
+
+  server.listen(0, 'localhost', common.mustCall(() => {
+    const port = server.address().port;
     const req = https.get({
       host: 'localhost',
       pathname: '/',
       port,
       family: 4,
       localPort: common.PORT,
-      rejectUnauthorized: false
+      rejectUnauthorized: false,
     }, common.mustCall(() => {
       assert.strictEqual(req.socket.localPort, common.PORT);
       assert.strictEqual(req.socket.remotePort, port);