From cc4cbb10df8534b174336c82abc406d3dea2fbe7 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Wed, 24 Feb 2016 23:47:47 +0100
Subject: [PATCH] test: fix flaky child-process-fork-regr-gh-2847

The test is still failing sometimes because when trying to establish the
second connection, the server is already closed. Bring back the code
that handled this case and was removed in the last refactoring of the
test. Also ignore the errors that might happen when sending the second
handle to the worker because it may already have exited.

PR-URL: https://github.com/nodejs/node/pull/5422
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 .../test-child-process-fork-regr-gh-2847.js   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-child-process-fork-regr-gh-2847.js b/test/parallel/test-child-process-fork-regr-gh-2847.js
index df13b79f4e2568..12f6f2b9bda5f4 100644
--- a/test/parallel/test-child-process-fork-regr-gh-2847.js
+++ b/test/parallel/test-child-process-fork-regr-gh-2847.js
@@ -32,6 +32,15 @@ var server = net.createServer(function(s) {
     var s = net.connect(common.PORT, function() {
       worker.send({}, s, callback);
     });
+
+    // Errors can happen if this connection
+    // is still happening while the server has been closed.
+    s.on('error', function(err) {
+      if ((err.code !== 'ECONNRESET') &&
+          ((err.code !== 'ECONNREFUSED'))) {
+        throw err;
+      }
+    });
   }
 
   worker.process.once('close', common.mustCall(function() {
@@ -40,7 +49,14 @@ var server = net.createServer(function(s) {
     server.close();
   }));
 
-  // Send 2 handles to make `process.disconnect()` wait
-  send();
   send();
+  send(function(err) {
+    // Ignore errors when sending the second handle because the worker
+    // may already have exited.
+    if (err) {
+      if (err.code !== 'ECONNREFUSED') {
+        throw err;
+      }
+    }
+  });
 });