From a91ed7ea4cc17c1c434bd21e1d2bab4c47074442 Mon Sep 17 00:00:00 2001
From: Stefania Sharp <stefaniasharp@gmail.com>
Date: Fri, 6 Oct 2017 11:09:42 -0700
Subject: [PATCH 1/3] test: expand error message

---
 test/parallel/test-cluster-worker-isdead.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
index 4850f6eae96707..6a87dc61e4e95f 100644
--- a/test/parallel/test-cluster-worker-isdead.js
+++ b/test/parallel/test-cluster-worker-isdead.js
@@ -7,11 +7,11 @@ if (cluster.isMaster) {
   const worker = cluster.fork();
   assert.ok(
     !worker.isDead(),
-    'isDead() should return false right after the worker has been created.');
+    `isDead() returned ${worker.isDead()}. isDead() should return false right after the worker has been created.`);
 
   worker.on('exit', function() {
     assert.ok(worker.isDead(),
-              'After an event has been emitted, isDead should return true');
+              `isDead() returned ${worker.isDead()}. After an event has been emitted, isDead should return true`);
   });
 
   worker.on('message', function(msg) {
@@ -22,6 +22,6 @@ if (cluster.isMaster) {
 
 } else if (cluster.isWorker) {
   assert.ok(!cluster.worker.isDead(),
-            'isDead() should return false when called from within a worker');
+            `isDead() returned ${cluster.worker.isDead()}. isDead() should return false when called from within a worker`);
   process.send('readyToDie');
 }

From 07c3e3d2221067d2392728892c747c77d60480e5 Mon Sep 17 00:00:00 2001
From: Stefania Sharp <stefaniasharp@gmail.com>
Date: Sat, 14 Oct 2017 20:20:52 -0700
Subject: [PATCH 2/3] test: Add constant for isDead result

---
 test/parallel/test-cluster-worker-isdead.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/parallel/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
index 6a87dc61e4e95f..b99cc7e04bac0c 100644
--- a/test/parallel/test-cluster-worker-isdead.js
+++ b/test/parallel/test-cluster-worker-isdead.js
@@ -5,13 +5,15 @@ const assert = require('assert');
 
 if (cluster.isMaster) {
   const worker = cluster.fork();
-  assert.ok(
-    !worker.isDead(),
-    `isDead() returned ${worker.isDead()}. isDead() should return false right after the worker has been created.`);
+  const workerDead = worker.isDead();
+  assert.ok(!workerDead,
+            `isDead() returned ${workerDead}. isDead() should return false ` +
+            'right after the worker has been created.');
 
   worker.on('exit', function() {
-    assert.ok(worker.isDead(),
-              `isDead() returned ${worker.isDead()}. After an event has been emitted, isDead should return true`);
+    assert.ok(workerDead,
+              `isDead() returned ${workerDead}. After an event has been ` +
+              'emitted, isDead should return true');
   });
 
   worker.on('message', function(msg) {
@@ -21,7 +23,9 @@ if (cluster.isMaster) {
   });
 
 } else if (cluster.isWorker) {
-  assert.ok(!cluster.worker.isDead(),
-            `isDead() returned ${cluster.worker.isDead()}. isDead() should return false when called from within a worker`);
+  const workerDead = cluster.worker.isDead();
+  assert.ok(!workerDead,
+            `isDead() returned ${workerDead}. isDead() should return `+
+            'false when called from within a worker');
   process.send('readyToDie');
 }

From 86cb3724dfcac1f8c2c54f256b092b0033001b3d Mon Sep 17 00:00:00 2001
From: Stefania Sharp <stefaniasharp@gmail.com>
Date: Mon, 16 Oct 2017 10:57:37 -0700
Subject: [PATCH 3/3] test: store exit isDead status

---
 test/parallel/test-cluster-worker-isdead.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
index b99cc7e04bac0c..af81d05e90f332 100644
--- a/test/parallel/test-cluster-worker-isdead.js
+++ b/test/parallel/test-cluster-worker-isdead.js
@@ -5,12 +5,13 @@ const assert = require('assert');
 
 if (cluster.isMaster) {
   const worker = cluster.fork();
-  const workerDead = worker.isDead();
+  let workerDead = worker.isDead();
   assert.ok(!workerDead,
-            `isDead() returned ${workerDead}. isDead() should return false ` +
-            'right after the worker has been created.');
+            `isDead() returned ${workerDead}. isDead() should return ` +
+            'false right after the worker has been created.');
 
   worker.on('exit', function() {
+    workerDead = worker.isDead();
     assert.ok(workerDead,
               `isDead() returned ${workerDead}. After an event has been ` +
               'emitted, isDead should return true');