Skip to content

Commit e203e39

Browse files
cjihrigaddaleax
authored andcommitted
test: refactor test-cluster-worker-isconnected.js
PR-URL: #13685 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: David Cai <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 80e6524 commit e203e39

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,30 @@
11
'use strict';
2-
require('../common');
2+
const common = require('../common');
33
const cluster = require('cluster');
44
const assert = require('assert');
55

66
if (cluster.isMaster) {
77
const worker = cluster.fork();
88

9-
assert.ok(worker.isConnected(),
10-
'isConnected() should return true as soon as the worker has ' +
11-
'been created.');
9+
assert.strictEqual(worker.isConnected(), true);
1210

13-
worker.on('disconnect', function() {
14-
assert.ok(!worker.isConnected(),
15-
'After a disconnect event has been emitted, ' +
16-
'isConncted should return false');
17-
});
11+
worker.on('disconnect', common.mustCall(() => {
12+
assert.strictEqual(worker.isConnected(), false);
13+
}));
1814

1915
worker.on('message', function(msg) {
2016
if (msg === 'readyToDisconnect') {
2117
worker.disconnect();
2218
}
2319
});
24-
2520
} else {
26-
assert.ok(cluster.worker.isConnected(),
27-
'isConnected() should return true from within a worker at all ' +
28-
'times.');
21+
function assertNotConnected() {
22+
assert.strictEqual(cluster.worker.isConnected(), false);
23+
}
2924

30-
cluster.worker.process.on('disconnect', function() {
31-
assert.ok(!cluster.worker.isConnected(),
32-
'isConnected() should return false from within a worker ' +
33-
'after its underlying process has been disconnected from ' +
34-
'the master');
35-
});
25+
assert.strictEqual(cluster.worker.isConnected(), true);
26+
cluster.worker.on('disconnect', common.mustCall(assertNotConnected));
27+
cluster.worker.process.on('disconnect', common.mustCall(assertNotConnected));
3628

3729
process.send('readyToDisconnect');
3830
}

0 commit comments

Comments
 (0)