From acb4e1d1acf85f59ea63dc9427bc786b9bc2973e Mon Sep 17 00:00:00 2001 From: sagirk Date: Mon, 19 Nov 2018 14:50:15 +0530 Subject: [PATCH 1/4] test: refactor test-cluster-send-deadlock to use arrow functions In `test/parallel/test-cluster-send-deadlock.js`, callbacks use anonymous closure functions. It is safe to replace them with arrow functions since these callbacks don't contain references to `this`, `super` or `arguments`. This results in shorter functions. --- test/parallel/test-cluster-send-deadlock.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js index b02837e7fb1793..b34eb892adb464 100644 --- a/test/parallel/test-cluster-send-deadlock.js +++ b/test/parallel/test-cluster-send-deadlock.js @@ -30,31 +30,31 @@ const net = require('net'); if (cluster.isMaster) { const worker = cluster.fork(); - worker.on('exit', function(code, signal) { + worker.on('exit', (code, signal) => { assert.strictEqual(code, 0, `Worker exited with an error code: ${code}`); assert(!signal, `Worker exited by a signal: ${signal}`); server.close(); }); - const server = net.createServer(function(socket) { + const server = net.createServer((socket) => { worker.send('handle', socket); }); - server.listen(0, function() { + server.listen(0, () => { worker.send({ message: 'listen', port: server.address().port }); }); } else { - process.on('message', function(msg, handle) { + process.on('message', (msg, handle) => { if (msg.message && msg.message === 'listen') { assert(msg.port); const client1 = net.connect({ host: 'localhost', port: msg.port - }, function() { + }, () => { const client2 = net.connect({ host: 'localhost', port: msg.port - }, function() { + }, () => { client1.on('close', onclose); client2.on('close', onclose); client1.end(); @@ -62,10 +62,10 @@ if (cluster.isMaster) { }); }); let waiting = 2; - function onclose() { + const onclose = () => { if (--waiting === 0) cluster.worker.disconnect(); - } + }; } else { process.send('reply', handle); } From 0d08ce2bf4df1f8eabcd8ae7117a80e168ae1f8f Mon Sep 17 00:00:00 2001 From: sagirk Date: Tue, 20 Nov 2018 13:52:33 +0530 Subject: [PATCH 2/4] test: wrap functions containing assertions inside a `common.mustCall` --- test/parallel/test-cluster-send-deadlock.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js index b34eb892adb464..576c7020a49ffe 100644 --- a/test/parallel/test-cluster-send-deadlock.js +++ b/test/parallel/test-cluster-send-deadlock.js @@ -23,18 +23,18 @@ // Testing mutual send of handles: from master to worker, and from worker to // master. -require('../common'); +const common = require('../common'); const assert = require('assert'); const cluster = require('cluster'); const net = require('net'); if (cluster.isMaster) { const worker = cluster.fork(); - worker.on('exit', (code, signal) => { + worker.on('exit', common.mustCall((code, signal) => { assert.strictEqual(code, 0, `Worker exited with an error code: ${code}`); assert(!signal, `Worker exited by a signal: ${signal}`); server.close(); - }); + })); const server = net.createServer((socket) => { worker.send('handle', socket); @@ -44,7 +44,7 @@ if (cluster.isMaster) { worker.send({ message: 'listen', port: server.address().port }); }); } else { - process.on('message', (msg, handle) => { + process.on('message', common.mustCall((msg, handle) => { if (msg.message && msg.message === 'listen') { assert(msg.port); const client1 = net.connect({ @@ -69,5 +69,5 @@ if (cluster.isMaster) { } else { process.send('reply', handle); } - }); + })); } From 28a3b9353482abf9b8d4c97822fe97346c3b59ff Mon Sep 17 00:00:00 2001 From: sagirk Date: Wed, 21 Nov 2018 13:43:27 +0530 Subject: [PATCH 3/4] test: remove `common.mustCall` wrapper over `exit` event handler --- test/parallel/test-cluster-send-deadlock.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js index 576c7020a49ffe..8c190bcdb09549 100644 --- a/test/parallel/test-cluster-send-deadlock.js +++ b/test/parallel/test-cluster-send-deadlock.js @@ -30,11 +30,11 @@ const net = require('net'); if (cluster.isMaster) { const worker = cluster.fork(); - worker.on('exit', common.mustCall((code, signal) => { + worker.on('exit', (code, signal) => { assert.strictEqual(code, 0, `Worker exited with an error code: ${code}`); assert(!signal, `Worker exited by a signal: ${signal}`); server.close(); - })); + }); const server = net.createServer((socket) => { worker.send('handle', socket); From fed582b56aa7d4b0233ce90b851c486dc41372e1 Mon Sep 17 00:00:00 2001 From: sagirk Date: Wed, 21 Nov 2018 16:29:03 +0530 Subject: [PATCH 4/4] Revert "test: wrap functions containing assertions inside a `common.mustCall`" This reverts commit 6eab88a71332e79825cd719dbc907564a2bfaec5. --- test/parallel/test-cluster-send-deadlock.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js index 8c190bcdb09549..b34eb892adb464 100644 --- a/test/parallel/test-cluster-send-deadlock.js +++ b/test/parallel/test-cluster-send-deadlock.js @@ -23,7 +23,7 @@ // Testing mutual send of handles: from master to worker, and from worker to // master. -const common = require('../common'); +require('../common'); const assert = require('assert'); const cluster = require('cluster'); const net = require('net'); @@ -44,7 +44,7 @@ if (cluster.isMaster) { worker.send({ message: 'listen', port: server.address().port }); }); } else { - process.on('message', common.mustCall((msg, handle) => { + process.on('message', (msg, handle) => { if (msg.message && msg.message === 'listen') { assert(msg.port); const client1 = net.connect({ @@ -69,5 +69,5 @@ if (cluster.isMaster) { } else { process.send('reply', handle); } - })); + }); }