diff options
author | Rich Trott <rtrott@gmail.com> | 2016-01-19 19:54:35 -0800 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2016-01-21 13:17:12 -0800 |
commit | 0634311a9ac3dda0e3b494f7f510c23ca48acd46 (patch) | |
tree | 4e2ee694b0fc95f5db64f10e0c9accbc4849a0e3 /test/sequential | |
parent | 66cb4bcf0c032adc0f6abf7452150875c8a82243 (diff) | |
download | node-new-0634311a9ac3dda0e3b494f7f510c23ca48acd46.tar.gz |
test: move cluster tests to parallel
Two cluster tests have recently changed so that they are no longer
resource intensive. Move them back to parallel.
Ref: https://github.com/nodejs/node/pull/4736
Ref: https://github.com/nodejs/node/pull/4739
PR-URL: https://github.com/nodejs/node/pull/4774
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'test/sequential')
-rw-r--r-- | test/sequential/test-cluster-disconnect-leak.js | 29 | ||||
-rw-r--r-- | test/sequential/test-cluster-disconnect-suicide-race.js | 27 |
2 files changed, 0 insertions, 56 deletions
diff --git a/test/sequential/test-cluster-disconnect-leak.js b/test/sequential/test-cluster-disconnect-leak.js deleted file mode 100644 index a4916c95ba..0000000000 --- a/test/sequential/test-cluster-disconnect-leak.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -// Test fails in Node v5.4.0 and passes in v5.4.1 and newer. - -const common = require('../common'); -const net = require('net'); -const cluster = require('cluster'); - -const noop = () => {}; - -cluster.schedulingPolicy = cluster.SCHED_NONE; - -if (cluster.isMaster) { - const worker = cluster.fork(); - - // This is the important part of the test: Confirm that `disconnect` fires. - worker.on('disconnect', common.mustCall(noop)); - - // These are just some extra stuff we're checking for good measure... - worker.on('exit', common.mustCall(noop)); - cluster.on('exit', common.mustCall(noop)); - - cluster.disconnect(); - return; -} - -const server = net.createServer(); - -server.listen(common.PORT); diff --git a/test/sequential/test-cluster-disconnect-suicide-race.js b/test/sequential/test-cluster-disconnect-suicide-race.js deleted file mode 100644 index 6f23b23fd2..0000000000 --- a/test/sequential/test-cluster-disconnect-suicide-race.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -// Test should fail in Node.js 5.4.1 and pass in later versions. - -const common = require('../common'); -const assert = require('assert'); -const cluster = require('cluster'); - -if (cluster.isMaster) { - cluster.on('exit', (worker, code) => { - assert.strictEqual(code, 0, 'worker exited with error'); - }); - - return cluster.fork(); -} - -var eventFired = false; - -cluster.worker.disconnect(); - -process.nextTick(common.mustCall(() => { - assert.strictEqual(eventFired, false, 'disconnect event should wait for ack'); -})); - -cluster.worker.on('disconnect', common.mustCall(() => { - eventFired = true; -})); |