From a7a788b267ac3e6acf065d5b05235c0ccb59a87e Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Fri, 2 Sep 2016 13:14:37 +0200
Subject: [PATCH 1/2] test: fix test-cluster-dgram-1 flakiness

Check for the number of messages received in the `exit` event listener
instead of the `disconnect` listener.

Fixes: https://github.com/nodejs/node/issues/8380
---
 test/parallel/test-cluster-dgram-1.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-cluster-dgram-1.js b/test/parallel/test-cluster-dgram-1.js
index 30420850a37cea..dcf982c9d8e0a7 100644
--- a/test/parallel/test-cluster-dgram-1.js
+++ b/test/parallel/test-cluster-dgram-1.js
@@ -66,7 +66,7 @@ function master() {
       received = msg.received;
     }));
 
-    worker.on('disconnect', common.mustCall(() => {
+    worker.on('exit', common.mustCall(() => {
       assert.strictEqual(received, PACKETS_PER_WORKER);
     }));
   }

From 589edc391372667354b201e36021dd0cb6a40a2e Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Fri, 2 Sep 2016 14:38:54 +0200
Subject: [PATCH 2/2] Fixup

---
 test/parallel/test-cluster-dgram-1.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/parallel/test-cluster-dgram-1.js b/test/parallel/test-cluster-dgram-1.js
index dcf982c9d8e0a7..3b27fa8e20cb6c 100644
--- a/test/parallel/test-cluster-dgram-1.js
+++ b/test/parallel/test-cluster-dgram-1.js
@@ -64,6 +64,7 @@ function master() {
 
     worker.on('message', common.mustCall((msg) => {
       received = msg.received;
+      worker.disconnect();
     }));
 
     worker.on('exit', common.mustCall(() => {
@@ -85,7 +86,7 @@ function worker() {
     // Every 10 messages, notify the master.
     if (received === PACKETS_PER_WORKER) {
       process.send({received: received});
-      process.disconnect();
+      socket.close();
     }
   }, PACKETS_PER_WORKER));