From 950287ee2611c2840e128c0e5ed41ee23c57dc7e Mon Sep 17 00:00:00 2001 From: juggernaut451 Date: Sun, 18 Mar 2018 01:08:36 +0530 Subject: [PATCH 1/3] test: refactor parallel/test-tls-delayed-attach test: refactor parallel/test-tls-delayed-attach Added description to the test, replace function with arrow function and implemented common.mustCall --- test/parallel/test-tls-delayed-attach.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/test/parallel/test-tls-delayed-attach.js b/test/parallel/test-tls-delayed-attach.js index fc5eaaa884c578..687c8c0a2b80a1 100644 --- a/test/parallel/test-tls-delayed-attach.js +++ b/test/parallel/test-tls-delayed-attach.js @@ -24,6 +24,8 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); +// Checks tls delay + const fixtures = require('../common/fixtures'); const assert = require('assert'); const tls = require('tls'); @@ -37,30 +39,30 @@ const options = { cert: fixtures.readKey('agent1-cert.pem') }; -const server = net.createServer(function(c) { +const server = net.createServer(common.mustCall((c) => { setTimeout(function() { const s = new tls.TLSSocket(c, { isServer: true, secureContext: tls.createSecureContext(options) }); - s.on('data', function(chunk) { + s.on('data', common.mustCall((chunk) => { received += chunk; - }); + })); - s.on('end', function() { + s.on('end', common.mustCall(() => { server.close(); s.destroy(); - }); + })); }, 200); -}).listen(0, function() { - const c = tls.connect(this.address().port, { +})).listen(0, common.mustCall(() => { + const c = tls.connect(server.address().port, { rejectUnauthorized: false - }, function() { + }, () => { c.end(sent); }); -}); +})); -process.on('exit', function() { +process.on('exit', () => { assert.strictEqual(received, sent); }); From 1b2c826bad9dc6a4ed06ce0423298f1de90acb67 Mon Sep 17 00:00:00 2001 From: juggernaut451 Date: Mon, 19 Mar 2018 17:21:08 +0530 Subject: [PATCH 2/3] More description added & common.mustCall remove while sending data --- test/parallel/test-tls-delayed-attach.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-tls-delayed-attach.js b/test/parallel/test-tls-delayed-attach.js index 687c8c0a2b80a1..8706d5e8728dd1 100644 --- a/test/parallel/test-tls-delayed-attach.js +++ b/test/parallel/test-tls-delayed-attach.js @@ -24,7 +24,7 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -// Checks tls delay +// Checks tls connection delay while sending and recieving data const fixtures = require('../common/fixtures'); const assert = require('assert'); @@ -46,9 +46,9 @@ const server = net.createServer(common.mustCall((c) => { secureContext: tls.createSecureContext(options) }); - s.on('data', common.mustCall((chunk) => { + s.on('data', (chunk) => { received += chunk; - })); + }); s.on('end', common.mustCall(() => { server.close(); From dc6c225891733147f309d686d9b0b4c9c83e69fd Mon Sep 17 00:00:00 2001 From: juggernaut451 Date: Tue, 20 Mar 2018 12:24:47 +0530 Subject: [PATCH 3/3] More description added --- test/parallel/test-tls-delayed-attach.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-tls-delayed-attach.js b/test/parallel/test-tls-delayed-attach.js index 8706d5e8728dd1..b756db2d67ca5f 100644 --- a/test/parallel/test-tls-delayed-attach.js +++ b/test/parallel/test-tls-delayed-attach.js @@ -24,7 +24,11 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -// Checks tls connection delay while sending and recieving data +// This test tries to confirm that a TLS Socket will work as expected even if it +// is created after the original socket has received some data. +// +// Ref: https://github.com/nodejs/node-v0.x-archive/issues/6940 +// Ref: https://github.com/nodejs/node-v0.x-archive/pull/6950 const fixtures = require('../common/fixtures'); const assert = require('assert');