test: use worker.exitedAfterDisconnect consistently

nodejs · Jun 20, 2017 · f1888bc · f1888bc
1 parent 14930b5
commit f1888bc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 28 deletions.
diff --git a/test/parallel/test-cluster-worker-constructor.js b/test/parallel/test-cluster-worker-constructor.js
@@ -29,7 +29,7 @@ const cluster = require('cluster');
 let worker;
 
 worker = new cluster.Worker();
-assert.strictEqual(worker.suicide, undefined);
+assert.strictEqual(worker.exitedAfterDisconnect, undefined);
 assert.strictEqual(worker.state, 'none');
 assert.strictEqual(worker.id, 0);
 assert.strictEqual(worker.process, undefined);
@@ -39,7 +39,7 @@ worker = new cluster.Worker({
   state: 'online',
   process: process
 });
-assert.strictEqual(worker.suicide, undefined);
+assert.strictEqual(worker.exitedAfterDisconnect, undefined);
 assert.strictEqual(worker.state, 'online');
 assert.strictEqual(worker.id, 3);
 assert.strictEqual(worker.process, process);

diff --git a/test/parallel/test-cluster-worker-deprecated.js b/test/parallel/test-cluster-worker-deprecated.js
diff --git a/test/parallel/test-cluster-worker-disconnect.js b/test/parallel/test-cluster-worker-disconnect.js
@@ -29,12 +29,8 @@ if (cluster.isWorker) {
   http.Server(() => {
 
   }).listen(0, '127.0.0.1');
-  const worker = cluster.worker;
-  assert.strictEqual(worker.exitedAfterDisconnect, worker.suicide);
 
   cluster.worker.on('disconnect', common.mustCall(() => {
-    assert.strictEqual(cluster.worker.exitedAfterDisconnect,
-                       cluster.worker.suicide);
     process.exit(42);
   }));
 

diff --git a/test/parallel/test-cluster-worker-exit.js b/test/parallel/test-cluster-worker-exit.js
@@ -52,7 +52,6 @@ if (cluster.isWorker) {
     worker_emitDisconnect: [1, "the worker did not emit 'disconnect'"],
     worker_emitExit: [1, "the worker did not emit 'exit'"],
     worker_state: ['disconnected', 'the worker state is incorrect'],
-    worker_suicideMode: [false, 'the worker.suicide flag is incorrect'],
     worker_exitedAfterDisconnect: [
       false, 'the .exitedAfterDisconnect flag is incorrect'
     ],
@@ -84,7 +83,6 @@ if (cluster.isWorker) {
   // Check worker events and properties
   worker.on('disconnect', common.mustCall(() => {
     results.worker_emitDisconnect += 1;
-    results.worker_suicideMode = worker.suicide;
     results.worker_exitedAfterDisconnect = worker.exitedAfterDisconnect;
     results.worker_state = worker.state;
     if (results.worker_emitExit > 0) {

diff --git a/test/parallel/test-regress-GH-3238.js b/test/parallel/test-regress-GH-3238.js
@@ -7,11 +7,11 @@ if (cluster.isMaster) {
   function forkWorker(action) {
     const worker = cluster.fork({ action });
     worker.on('disconnect', common.mustCall(() => {
-      assert.strictEqual(worker.suicide, true);
+      assert.strictEqual(worker.exitedAfterDisconnect, true);
     }));
 
     worker.on('exit', common.mustCall(() => {
-      assert.strictEqual(worker.suicide, true);
+      assert.strictEqual(worker.exitedAfterDisconnect, true);
     }));
   }