From 4a6bd8683f65dd0c7d277b891eae1227ef1a945c Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 14 Oct 2016 09:26:12 -0700
Subject: [PATCH] test: fix flaky test-child-process-fork-dgram

`test-child-process-fork-dgram` is unreliable on some platforms,
especially FreeBSD and AIX within the project's continuous integration
testing. It has also been observed to be flaky on macos.

* Confirm child has received the server before sending packets
* Close the server instance on the parent or child after receiving a

Refs: https://github.com/nodejs/node/pull/8697
Fixes: https://github.com/nodejs/node/issues/8949
Fixes: https://github.com/nodejs/node/issues/8271
PR-URL: https://github.com/nodejs/node/pull/9098
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
---
 test/parallel/parallel.status                 |   3 -
 .../parallel/test-child-process-fork-dgram.js | 101 ++++++++----------
 2 files changed, 43 insertions(+), 61 deletions(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index fc4d131b72..092fd9dafb 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -35,6 +35,3 @@ test-regress-GH-1899                 : FAIL, PASS
 # localIPv6Hosts list from test/common.js.
 test-https-connect-address-family : PASS,FLAKY
 test-tls-connect-address-family : PASS,FLAKY
-
-#covered by https://github.com/nodejs/node/issues/8271
-test-child-process-fork-dgram            : PASS, FLAKY
diff --git a/test/parallel/test-child-process-fork-dgram.js b/test/parallel/test-child-process-fork-dgram.js
index 1edd2b85ca..8bdf006a74 100644
--- a/test/parallel/test-child-process-fork-dgram.js
+++ b/test/parallel/test-child-process-fork-dgram.js
@@ -4,101 +4,86 @@
  * sending a fd representing a UDP socket to the child and sending messages
  * to this endpoint, these messages are distributed to the parent and the
  * child process.
- *
- * Because it's not really possible to predict how the messages will be
- * distributed among the parent and the child processes, we keep sending
- * messages until both the parent and the child received at least one
- * message. The worst case scenario is when either one never receives
- * a message. In this case the test runner will timeout after 60 secs
- * and the test will fail.
  */
 
-var dgram = require('dgram');
-var fork = require('child_process').fork;
-var assert = require('assert');
-var common = require('../common');
+const common = require('../common');
+const dgram = require('dgram');
+const fork = require('child_process').fork;
+const assert = require('assert');
 
 if (common.isWindows) {
-  common.skip('Sending dgram sockets to child processes is ' +
-              'not supported');
+  common.skip('Sending dgram sockets to child processes is not supported');
   return;
 }
 
-var server;
 if (process.argv[2] === 'child') {
-  process.on('message', function removeMe(msg, clusterServer) {
-    if (msg === 'server') {
-      server = clusterServer;
-
-      server.on('message', function() {
-        process.send('gotMessage');
-      });
-
-    } else if (msg === 'stop') {
-      server.close();
-      process.removeListener('message', removeMe);
-    }
+  let childServer;
+
+  process.once('message', function(msg, clusterServer) {
+    childServer = clusterServer;
+
+    childServer.once('message', function() {
+      process.send('gotMessage');
+      childServer.close();
+    });
+
+    process.send('handleReceived');
   });
 
 } else {
-  server = dgram.createSocket('udp4');
-  var client = dgram.createSocket('udp4');
-  var child = fork(__filename, ['child']);
+  const parentServer = dgram.createSocket('udp4');
+  const client = dgram.createSocket('udp4');
+  const child = fork(__filename, ['child']);
 
-  var msg = new Buffer('Some bytes');
+  const msg = Buffer.from('Some bytes');
 
   var childGotMessage = false;
   var parentGotMessage = false;
 
-  server.on('message', function(msg, rinfo) {
+  parentServer.once('message', function(msg, rinfo) {
     parentGotMessage = true;
+    parentServer.close();
   });
 
-  server.on('listening', function() {
-    child.send('server', server);
+  parentServer.on('listening', function() {
+    child.send('server', parentServer);
 
-    child.once('message', function(msg) {
+    child.on('message', function(msg) {
       if (msg === 'gotMessage') {
         childGotMessage = true;
+      } else if (msg = 'handlReceived') {
+        sendMessages();
       }
     });
-
-    sendMessages();
   });
 
-  var sendMessages = function() {
-    var timer = setInterval(function() {
-      client.send(
-        msg,
-        0,
-        msg.length,
-        server.address().port,
-        '127.0.0.1',
-        function(err) {
-          if (err) throw err;
-        }
-      );
+  const sendMessages = function() {
+    const serverPort = parentServer.address().port;
 
+    const timer = setInterval(function() {
       /*
        * Both the parent and the child got at least one message,
        * test passed, clean up everyting.
        */
       if (parentGotMessage && childGotMessage) {
         clearInterval(timer);
-        shutdown();
+        client.close();
+      } else {
+        client.send(
+          msg,
+          0,
+          msg.length,
+          serverPort,
+          '127.0.0.1',
+          function(err) {
+            if (err) throw err;
+          }
+        );
       }
-
     }, 1);
   };
 
-  var shutdown = function() {
-    child.send('stop');
-
-    server.close();
-    client.close();
-  };
-
-  server.bind(0, '127.0.0.1');
+  parentServer.bind(0, '127.0.0.1');
 
   process.once('exit', function() {
     assert(parentGotMessage);