Commit be82745
test: improve test-cluster-disconnect-suicide-race
Previously, test-cluster-disconnect-suicide-race had two issues:
* Magic numbers: How many times to spawn a worker was determined through
empirical experimentation. This means that as new platforms and new
CPU/RAM configurations are tested, the magic numbers require more
and more refinement. This brings us to...
* Non-determinism: The test seems to fail all the time when the bug
it tests for is present, but it's really a judgment based on sampling.
"Oh, with 8 workers per CPU, it fails about 80% of the time. Let's try
16..."
This revised version of the test takes a different approach. The fix
for the bug that the test was written for means that the disconnect
event will fire on a subsequent tick. So we check for that and the test
still fails when the fix is not in the code base and succeeds when it
is.
Advantages of this approach include:
* The test runs much faster.
* The test should be reliable on any new platform regardless of CPU and
RAM.
PR-URL: #4739
Ref: #4674
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 748d2b4 commit be82745
1 file changed
Lines changed: 18 additions & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,32 +1,27 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | + | ||
| 3 | + // Test should fail in Node.js 5.4.1 and pass in later versions. | ||
| 4 | + | ||
| 2 | 5 | const common = require('../common'); | |
| 3 | 6 | const assert = require('assert'); | |
| 4 | 7 | const cluster = require('cluster'); | |
| 5 | - const os = require('os'); | ||
| 6 | 8 | ||
| 7 | 9 | if (cluster.isMaster) { | |
| 8 | - function forkWorker(action) { | ||
| 9 | - const worker = cluster.fork({ action }); | ||
| 10 | - worker.on('disconnect', common.mustCall(() => { | ||
| 11 | - assert.strictEqual(worker.suicide, true); | ||
| 12 | - })); | ||
| 10 | + cluster.on('exit', (worker, code) => { | ||
| 11 | + assert.strictEqual(code, 0, 'worker exited with error'); | ||
| 12 | + }); | ||
| 13 | + | ||
| 14 | + return cluster.fork(); | ||
| 15 | + } | ||
| 13 | 16 | ||
| 14 | - worker.on('exit', common.mustCall(() => { | ||
| 15 | - assert.strictEqual(worker.suicide, true); | ||
| 16 | - })); | ||
| 17 | - } | ||
| 17 | + var eventFired = false; | ||
| 18 | 18 | ||
| 19 | - const cpus = os.cpus().length; | ||
| 20 | - const tries = cpus > 8 ? 64 : cpus * 8; | ||
| 19 | + cluster.worker.disconnect(); | ||
| 21 | 20 | ||
| 22 | - cluster.on('exit', common.mustCall((worker, code) => { | ||
| 23 | - assert.strictEqual(code, 0, 'worker exited with error'); | ||
| 24 | - }, tries * 2)); | ||
| 25 | - | ||
| 26 | - for (let i = 0; i < tries; ++i) { | ||
| 27 | - forkWorker('disconnect'); | ||
| 28 | - forkWorker('kill'); | ||
| 29 | - } | ||
| 30 | - } else { | ||
| 31 | - cluster.worker[process.env.action](); | ||
| 32 | - } | ||
| 21 | + process.nextTick(common.mustCall(() => { | ||
| 22 | + assert.strictEqual(eventFired, false, 'disconnect event should wait for ack'); | ||
| 23 | + })); | ||
| 24 | + | ||
| 25 | + cluster.worker.on('disconnect', common.mustCall(() => { | ||
| 26 | + eventFired = true; | ||
| 27 | + })); | ||
0 commit comments