Commit eaaec57
committed
test: use worker.exitedAfterDisconnect consistently
PR-URL: #13702
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent 3fab9f2 commit eaaec57
5 files changed
Lines changed: 4 additions & 28 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,7 +29,7 @@ const cluster = require('cluster'); | |||
| 29 | 29 | let worker; | |
| 30 | 30 | ||
| 31 | 31 | worker = new cluster.Worker(); | |
| 32 | - assert.strictEqual(worker.suicide, undefined); | ||
| 32 | + assert.strictEqual(worker.exitedAfterDisconnect, undefined); | ||
| 33 | 33 | assert.strictEqual(worker.state, 'none'); | |
| 34 | 34 | assert.strictEqual(worker.id, 0); | |
| 35 | 35 | assert.strictEqual(worker.process, undefined); | |
@@ -39,7 +39,7 @@ worker = new cluster.Worker({ | |||
| 39 | 39 | state: 'online', | |
| 40 | 40 | process: process | |
| 41 | 41 | }); | |
| 42 | - assert.strictEqual(worker.suicide, undefined); | ||
| 42 | + assert.strictEqual(worker.exitedAfterDisconnect, undefined); | ||
| 43 | 43 | assert.strictEqual(worker.state, 'online'); | |
| 44 | 44 | assert.strictEqual(worker.id, 3); | |
| 45 | 45 | assert.strictEqual(worker.process, process); | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,12 +29,8 @@ if (cluster.isWorker) { | |||
| 29 | 29 | http.Server(() => { | |
| 30 | 30 | ||
| 31 | 31 | }).listen(0, '127.0.0.1'); | |
| 32 | - const worker = cluster.worker; | ||
| 33 | - assert.strictEqual(worker.exitedAfterDisconnect, worker.suicide); | ||
| 34 | 32 | ||
| 35 | 33 | cluster.worker.on('disconnect', common.mustCall(() => { | |
| 36 | - assert.strictEqual(cluster.worker.exitedAfterDisconnect, | ||
| 37 | - cluster.worker.suicide); | ||
| 38 | 34 | process.exit(42); | |
| 39 | 35 | })); | |
| 40 | 36 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -52,7 +52,6 @@ if (cluster.isWorker) { | |||
| 52 | 52 | worker_emitDisconnect: [1, "the worker did not emit 'disconnect'"], | |
| 53 | 53 | worker_emitExit: [1, "the worker did not emit 'exit'"], | |
| 54 | 54 | worker_state: ['disconnected', 'the worker state is incorrect'], | |
| 55 | - worker_suicideMode: [false, 'the worker.suicide flag is incorrect'], | ||
| 56 | 55 | worker_exitedAfterDisconnect: [ | |
| 57 | 56 | false, 'the .exitedAfterDisconnect flag is incorrect' | |
| 58 | 57 | ], | |
@@ -84,7 +83,6 @@ if (cluster.isWorker) { | |||
| 84 | 83 | // Check worker events and properties | |
| 85 | 84 | worker.on('disconnect', common.mustCall(() => { | |
| 86 | 85 | results.worker_emitDisconnect += 1; | |
| 87 | - results.worker_suicideMode = worker.suicide; | ||
| 88 | 86 | results.worker_exitedAfterDisconnect = worker.exitedAfterDisconnect; | |
| 89 | 87 | results.worker_state = worker.state; | |
| 90 | 88 | if (results.worker_emitExit > 0) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,11 +7,11 @@ if (cluster.isMaster) { | |||
| 7 | 7 | function forkWorker(action) { | |
| 8 | 8 | const worker = cluster.fork({ action }); | |
| 9 | 9 | worker.on('disconnect', common.mustCall(() => { | |
| 10 | - assert.strictEqual(worker.suicide, true); | ||
| 10 | + assert.strictEqual(worker.exitedAfterDisconnect, true); | ||
| 11 | 11 | })); | |
| 12 | 12 | ||
| 13 | 13 | worker.on('exit', common.mustCall(() => { | |
| 14 | - assert.strictEqual(worker.suicide, true); | ||
| 14 | + assert.strictEqual(worker.exitedAfterDisconnect, true); | ||
| 15 | 15 | })); | |
| 16 | 16 | } | |
| 17 | 17 | ||
0 commit comments