Commit 0178001
test: make test-cluster-disconnect-leak reliable
Previously, test-cluster-disconnect-leak 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 reliably for a single worker. 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 now works on Windows. The previous version skipped Windows.
* The test should be reliable on any new platform regardless of CPU and
RAM.
Ref: #4674
PR-URL: #4736
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>1 parent cb5986d commit 0178001
1 file changed
Lines changed: 14 additions & 32 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,47 +1,29 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - // Flags: --expose-internals | ||
| 2 | + | ||
| 3 | + // Test fails in Node v5.4.0 and passes in v5.4.1 and newer. | ||
| 3 | 4 | ||
| 4 | 5 | const common = require('../common'); | |
| 5 | - const assert = require('assert'); | ||
| 6 | 6 | const net = require('net'); | |
| 7 | 7 | const cluster = require('cluster'); | |
| 8 | - const handles = require('internal/cluster').handles; | ||
| 9 | - const os = require('os'); | ||
| 10 | 8 | ||
| 11 | - if (common.isWindows) { | ||
| 12 | - console.log('1..0 # Skipped: This test does not apply to Windows.'); | ||
| 13 | - return; | ||
| 14 | - } | ||
| 9 | + const noop = () => {}; | ||
| 15 | 10 | ||
| 16 | 11 | cluster.schedulingPolicy = cluster.SCHED_NONE; | |
| 17 | 12 | ||
| 18 | 13 | if (cluster.isMaster) { | |
| 19 | - const cpus = os.cpus().length; | ||
| 20 | - const tries = cpus > 8 ? 128 : cpus * 16; | ||
| 21 | - | ||
| 22 | - const worker1 = cluster.fork(); | ||
| 23 | - worker1.on('message', common.mustCall(() => { | ||
| 24 | - worker1.disconnect(); | ||
| 25 | - for (let i = 0; i < tries; ++ i) { | ||
| 26 | - const w = cluster.fork(); | ||
| 27 | - w.on('online', common.mustCall(w.disconnect)); | ||
| 28 | - } | ||
| 29 | - })); | ||
| 30 | - | ||
| 31 | - cluster.on('exit', common.mustCall((worker, code) => { | ||
| 32 | - assert.strictEqual(code, 0, 'worker exited with error'); | ||
| 33 | - }, tries + 1)); | ||
| 34 | - | ||
| 35 | - process.on('exit', () => { | ||
| 36 | - assert.deepEqual(Object.keys(cluster.workers), []); | ||
| 37 | - assert.strictEqual(Object.keys(handles).length, 0); | ||
| 38 | - }); | ||
| 14 | + const worker = cluster.fork(); | ||
| 15 | + | ||
| 16 | + // This is the important part of the test: Confirm that `disconnect` fires. | ||
| 17 | + worker.on('disconnect', common.mustCall(noop)); | ||
| 18 | + | ||
| 19 | + // These are just some extra stuff we're checking for good measure... | ||
| 20 | + worker.on('exit', common.mustCall(noop)); | ||
| 21 | + cluster.on('exit', common.mustCall(noop)); | ||
| 39 | 22 | ||
| 23 | + cluster.disconnect(); | ||
| 40 | 24 | return; | |
| 41 | 25 | } | |
| 42 | 26 | ||
| 43 | - var server = net.createServer(); | ||
| 27 | + const server = net.createServer(); | ||
| 44 | 28 | ||
| 45 | - server.listen(common.PORT, function() { | ||
| 46 | - process.send('listening'); | ||
| 47 | - }); | ||
| 29 | + server.listen(common.PORT); | ||
0 commit comments