From c8e13e4bb8c11bc61919aca2b3a403753aa0a6fb Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 20 Nov 2016 21:12:09 -0800 Subject: [PATCH 1/2] test:refactor test-tls-hello-parser-failure * setTimeout() with no duration -> setImmediate() * add common.mustCall() where appropriate * var -> const * .on() -> .once() --- .../parallel/test-tls-hello-parser-failure.js | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/test/parallel/test-tls-hello-parser-failure.js b/test/parallel/test-tls-hello-parser-failure.js index e5e43c408abfc6..cce41e9a9618b4 100644 --- a/test/parallel/test-tls-hello-parser-failure.js +++ b/test/parallel/test-tls-hello-parser-failure.js @@ -1,46 +1,43 @@ 'use strict'; -var common = require('../common'); -var assert = require('assert'); + +const common = require('../common'); if (!common.hasCrypto) { common.skip('missing crypto'); return; } -var tls = require('tls'); -var net = require('net'); -var fs = require('fs'); +const assert = require('assert'); +const tls = require('tls'); + +const net = require('net'); +const fs = require('fs'); -var options = { +const options = { key: fs.readFileSync(common.fixturesDir + '/test_key.pem'), cert: fs.readFileSync(common.fixturesDir + '/test_cert.pem') }; -var bonkers = Buffer.alloc(1024 * 1024, 42); +const bonkers = Buffer.alloc(1024 * 1024, 42); -var server = tls.createServer(options, function(c) { +const server = tls.createServer(options, function(c) { -}).listen(0, function() { - var client = net.connect(this.address().port, function() { +}).listen(0, common.mustCall(function() { + const client = net.connect(this.address().port, common.mustCall(function() { client.write(bonkers); - }); + })); - var once = false; - - var writeAgain = setTimeout(function() { + const writeAgain = setImmediate(function() { client.write(bonkers); }); - client.on('error', function(err) { - if (!once) { - clearTimeout(writeAgain); - once = true; - client.destroy(); - server.close(); - } + client.once('error', function(err) { + clearImmediate(writeAgain); + client.destroy(); + server.close(); }); - client.on('close', function(hadError) { + client.on('close', common.mustCall(function(hadError) { assert.strictEqual(hadError, true, 'Client never errored'); - }); -}); + })); +})); From 98abcf300bb269a8e88f611ca9e3e1eeeff80f25 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 21 Nov 2016 14:53:22 -0800 Subject: [PATCH 2/2] squash: add another common.mustCall() --- test/parallel/test-tls-hello-parser-failure.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-hello-parser-failure.js b/test/parallel/test-tls-hello-parser-failure.js index cce41e9a9618b4..f9c280f5e57a34 100644 --- a/test/parallel/test-tls-hello-parser-failure.js +++ b/test/parallel/test-tls-hello-parser-failure.js @@ -31,11 +31,11 @@ const server = tls.createServer(options, function(c) { client.write(bonkers); }); - client.once('error', function(err) { + client.once('error', common.mustCall(function(err) { clearImmediate(writeAgain); client.destroy(); server.close(); - }); + })); client.on('close', common.mustCall(function(hadError) { assert.strictEqual(hadError, true, 'Client never errored');