Skip to content

Commit eaaec57

Browse files
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

‎test/parallel/test-cluster-worker-constructor.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const cluster = require('cluster');
2929
letworker;
3030

3131
worker=newcluster.Worker();
32-
assert.strictEqual(worker.suicide,undefined);
32+
assert.strictEqual(worker.exitedAfterDisconnect,undefined);
3333
assert.strictEqual(worker.state,'none');
3434
assert.strictEqual(worker.id,0);
3535
assert.strictEqual(worker.process,undefined);
@@ -39,7 +39,7 @@ worker = new cluster.Worker({
3939
state: 'online',
4040
process: process
4141
});
42-
assert.strictEqual(worker.suicide,undefined);
42+
assert.strictEqual(worker.exitedAfterDisconnect,undefined);
4343
assert.strictEqual(worker.state,'online');
4444
assert.strictEqual(worker.id,3);
4545
assert.strictEqual(worker.process,process);

‎test/parallel/test-cluster-worker-deprecated.js‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎test/parallel/test-cluster-worker-disconnect.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@ if (cluster.isWorker) {
2929
http.Server(()=>{
3030

3131
}).listen(0,'127.0.0.1');
32-
constworker=cluster.worker;
33-
assert.strictEqual(worker.exitedAfterDisconnect,worker.suicide);
3432

3533
cluster.worker.on('disconnect',common.mustCall(()=>{
36-
assert.strictEqual(cluster.worker.exitedAfterDisconnect,
37-
cluster.worker.suicide);
3834
process.exit(42);
3935
}));
4036

‎test/parallel/test-cluster-worker-exit.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ if (cluster.isWorker) {
5252
worker_emitDisconnect: [1,"the worker did not emit 'disconnect'"],
5353
worker_emitExit: [1,"the worker did not emit 'exit'"],
5454
worker_state: ['disconnected','the worker state is incorrect'],
55-
worker_suicideMode: [false,'the worker.suicide flag is incorrect'],
5655
worker_exitedAfterDisconnect: [
5756
false,'the .exitedAfterDisconnect flag is incorrect'
5857
],
@@ -84,7 +83,6 @@ if (cluster.isWorker) {
8483
// Check worker events and properties
8584
worker.on('disconnect',common.mustCall(()=>{
8685
results.worker_emitDisconnect+=1;
87-
results.worker_suicideMode=worker.suicide;
8886
results.worker_exitedAfterDisconnect=worker.exitedAfterDisconnect;
8987
results.worker_state=worker.state;
9088
if(results.worker_emitExit>0){

‎test/parallel/test-regress-GH-3238.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ if (cluster.isMaster) {
77
functionforkWorker(action){
88
constworker=cluster.fork({ action });
99
worker.on('disconnect',common.mustCall(()=>{
10-
assert.strictEqual(worker.suicide,true);
10+
assert.strictEqual(worker.exitedAfterDisconnect,true);
1111
}));
1212

1313
worker.on('exit',common.mustCall(()=>{
14-
assert.strictEqual(worker.suicide,true);
14+
assert.strictEqual(worker.exitedAfterDisconnect,true);
1515
}));
1616
}
1717

0 commit comments

Comments
 (0)