From dae313de6f923a42843d5b0a9235c09e78f4fbe4 Mon Sep 17 00:00:00 2001
From: jBarz <jbarboza@ca.ibm.com>
Date: Sat, 18 Feb 2017 20:04:12 -0500
Subject: [PATCH] test: fix `test-cluster-worker-kill`

cherry-pick following from master

commit 8d394810e851efe24b4c880b9fa39d8e07cf661a
Author: Santiago Gimeno <santiago.gimeno@gmail.com>
Date:   Sun Mar 20 21:11:36 2016 +0100

    test: fix `test-cluster-worker-kill`

    Don't check that the `disconnect` event is emitted before the `exit`
    event as the order is not guaranteed.

    PR-URL: https://github.com/nodejs/node/pull/5814
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/simple/test-cluster-worker-kill.js | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/test/simple/test-cluster-worker-kill.js b/test/simple/test-cluster-worker-kill.js
index 8c6068e8db90..1176fb208094 100644
--- a/test/simple/test-cluster-worker-kill.js
+++ b/test/simple/test-cluster-worker-kill.js
@@ -79,8 +79,6 @@ if (cluster.isWorker) {
     results.cluster_exitCode = worker.process.exitCode;
     results.cluster_signalCode = worker.process.signalCode;
     results.cluster_emitExit += 1;
-    assert.ok(results.cluster_emitDisconnect,
-        "cluster: 'exit' event before 'disconnect' event");
   });
 
   // Check worker events and properties
@@ -96,26 +94,12 @@ if (cluster.isWorker) {
     results.worker_signalCode = signalCode;
     results.worker_emitExit += 1;
     results.worker_died = !alive(worker.process.pid);
-    assert.ok(results.worker_emitDisconnect,
-        "worker: 'exit' event before 'disconnect' event");
-
-    process.nextTick(function() { finish_test(); });
   });
 
-  var finish_test = function() {
-    try {
-      checkResults(expected_results, results);
-    } catch (exc) {
-      console.error('FAIL: ' + exc.message);
-      if (exc.name != 'AssertionError') {
-        console.trace(exc);
-      }
+  process.on('exit', function() {
+    checkResults(expected_results, results);
+  });
 
-      process.exit(1);
-      return;
-    }
-    process.exit(0);
-  };
 }
 
 // some helper functions ...