From 515db4cad8378b651f98691d5a6eb0a94e14abb8 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 28 Jun 2016 17:14:19 -0700 Subject: [PATCH 1/2] test: remove common.PORT from http tests --- .../test-http-client-keep-alive-release-before-finish.js | 8 +++++--- test/parallel/test-http-no-read-no-dump.js | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/test/parallel/test-http-client-keep-alive-release-before-finish.js b/test/parallel/test-http-client-keep-alive-release-before-finish.js index 374bacba3e5362..23686f89c28e5a 100644 --- a/test/parallel/test-http-client-keep-alive-release-before-finish.js +++ b/test/parallel/test-http-client-keep-alive-release-before-finish.js @@ -4,16 +4,18 @@ const http = require('http'); const server = http.createServer((req, res) => { res.end(); -}).listen(common.PORT, common.mustCall(() => { +}).listen(0, common.mustCall(() => { const agent = new http.Agent({ maxSockets: 1, keepAlive: true }); + const port = server.address().port; + const post = http.request({ agent: agent, method: 'POST', - port: common.PORT, + port: port, }, common.mustCall((res) => { res.resume(); })); @@ -30,7 +32,7 @@ const server = http.createServer((req, res) => { http.request({ agent: agent, method: 'GET', - port: common.PORT, + port: port, }, common.mustCall((res) => { server.close(); res.connection.end(); diff --git a/test/parallel/test-http-no-read-no-dump.js b/test/parallel/test-http-no-read-no-dump.js index c509146c0a29d7..457632d6926f68 100644 --- a/test/parallel/test-http-no-read-no-dump.js +++ b/test/parallel/test-http-no-read-no-dump.js @@ -15,16 +15,18 @@ const server = http.createServer((req, res) => { res.end(); onPause(); }); -}).listen(common.PORT, common.mustCall(() => { +}).listen(0, common.mustCall(() => { const agent = new http.Agent({ maxSockets: 1, keepAlive: true }); + const port = server.address().port; + const post = http.request({ agent: agent, method: 'POST', - port: common.PORT, + port: port, }, common.mustCall((res) => { res.resume(); @@ -43,7 +45,7 @@ const server = http.createServer((req, res) => { http.request({ agent: agent, method: 'GET', - port: common.PORT, + port: port, }, common.mustCall((res) => { server.close(); res.connection.end(); From a3ff272326843665836ab6ba8cda5e1fffb9b688 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 29 Jun 2016 09:37:28 -0700 Subject: [PATCH 2/2] squash: object shorthand nits --- .../test-http-client-keep-alive-release-before-finish.js | 8 ++++---- test/parallel/test-http-no-read-no-dump.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/parallel/test-http-client-keep-alive-release-before-finish.js b/test/parallel/test-http-client-keep-alive-release-before-finish.js index 23686f89c28e5a..0efedc91e2613d 100644 --- a/test/parallel/test-http-client-keep-alive-release-before-finish.js +++ b/test/parallel/test-http-client-keep-alive-release-before-finish.js @@ -13,9 +13,9 @@ const server = http.createServer((req, res) => { const port = server.address().port; const post = http.request({ - agent: agent, + agent, method: 'POST', - port: port, + port, }, common.mustCall((res) => { res.resume(); })); @@ -30,9 +30,9 @@ const server = http.createServer((req, res) => { }, 100); http.request({ - agent: agent, + agent, method: 'GET', - port: port, + port, }, common.mustCall((res) => { server.close(); res.connection.end(); diff --git a/test/parallel/test-http-no-read-no-dump.js b/test/parallel/test-http-no-read-no-dump.js index 457632d6926f68..17d36c56b2eeba 100644 --- a/test/parallel/test-http-no-read-no-dump.js +++ b/test/parallel/test-http-no-read-no-dump.js @@ -24,9 +24,9 @@ const server = http.createServer((req, res) => { const port = server.address().port; const post = http.request({ - agent: agent, + agent, method: 'POST', - port: port, + port, }, common.mustCall((res) => { res.resume(); @@ -43,9 +43,9 @@ const server = http.createServer((req, res) => { post.write('initial'); http.request({ - agent: agent, + agent, method: 'GET', - port: port, + port, }, common.mustCall((res) => { server.close(); res.connection.end();