From eaaec57332c466b39a12245de3b31d002250bec1 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Thu, 15 Jun 2017 08:30:20 -0700 Subject: [PATCH] test: use worker.exitedAfterDisconnect consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/13702 Reviewed-By: Refael Ackermann Reviewed-By: Sam Roberts Reviewed-By: Tobias Nießen Reviewed-By: Matteo Collina Reviewed-By: Colin Ihrig Reviewed-By: Anna Henningsen --- .../test-cluster-worker-constructor.js | 4 ++-- .../parallel/test-cluster-worker-deprecated.js | 18 ------------------ .../parallel/test-cluster-worker-disconnect.js | 4 ---- test/parallel/test-cluster-worker-exit.js | 2 -- test/parallel/test-regress-GH-3238.js | 4 ++-- 5 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 test/parallel/test-cluster-worker-deprecated.js diff --git a/test/parallel/test-cluster-worker-constructor.js b/test/parallel/test-cluster-worker-constructor.js index a8094e34df9c72..06a1ad774ccc51 100644 --- 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 deleted file mode 100644 index 2f433aae797ccc..00000000000000 --- a/test/parallel/test-cluster-worker-deprecated.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; -require('../common'); - -const assert = require('assert'); -const cluster = require('cluster'); - -const worker = new cluster.Worker(); - -assert.strictEqual(worker.exitedAfterDisconnect, undefined); -assert.strictEqual(worker.suicide, undefined); - -worker.exitedAfterDisconnect = 'recommended'; -assert.strictEqual(worker.exitedAfterDisconnect, 'recommended'); -assert.strictEqual(worker.suicide, 'recommended'); - -worker.suicide = 'deprecated'; -assert.strictEqual(worker.exitedAfterDisconnect, 'deprecated'); -assert.strictEqual(worker.suicide, 'deprecated'); diff --git a/test/parallel/test-cluster-worker-disconnect.js b/test/parallel/test-cluster-worker-disconnect.js index 0554671fea3b61..1c5a7fc3ae51f9 100644 --- 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 index 75a271278f6d30..ba9c4f8775760e 100644 --- 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 index e6fe030bda9a10..dd65d849d57503 100644 --- 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); })); }