From 890d643b90efcb487bcabd62f3da3fdbd11bd62f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 1 Dec 2019 03:06:51 -0800 Subject: test: move test-child-process-fork-getconnections to parallel Now that the test uses an open port assigned by the operating system rather than a hardcoded common.PORT, it can be moved to parallel. PR-URL: https://github.com/nodejs/node/pull/30749 Reviewed-By: Denys Otrishko Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater --- .../test-child-process-fork-getconnections.js | 121 +++++++++++++++++++++ .../test-child-process-fork-getconnections.js | 121 --------------------- 2 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 test/parallel/test-child-process-fork-getconnections.js delete mode 100644 test/sequential/test-child-process-fork-getconnections.js diff --git a/test/parallel/test-child-process-fork-getconnections.js b/test/parallel/test-child-process-fork-getconnections.js new file mode 100644 index 0000000000..1b1ba9c0d9 --- /dev/null +++ b/test/parallel/test-child-process-fork-getconnections.js @@ -0,0 +1,121 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +'use strict'; +require('../common'); +const assert = require('assert'); +const fork = require('child_process').fork; +const net = require('net'); +const count = 12; + +if (process.argv[2] === 'child') { + const sockets = []; + + process.on('message', function(m, socket) { + function sendClosed(id) { + process.send({ id: id, status: 'closed' }); + } + + if (m.cmd === 'new') { + assert(socket); + assert(socket instanceof net.Socket, 'should be a net.Socket'); + sockets.push(socket); + } + + if (m.cmd === 'close') { + assert.strictEqual(socket, undefined); + if (sockets[m.id].destroyed) { + // Workaround for https://github.com/nodejs/node/issues/2610 + sendClosed(m.id); + // End of workaround. When bug is fixed, this code can be used instead: + // throw new Error('socket destroyed unexpectedly!'); + } else { + sockets[m.id].once('close', sendClosed.bind(null, m.id)); + sockets[m.id].destroy(); + } + } + }); + +} else { + const child = fork(process.argv[1], ['child']); + + child.on('exit', function(code, signal) { + if (!subprocessKilled) + throw new Error('subprocess died unexpectedly!'); + }); + + const server = net.createServer(); + const sockets = []; + let sent = 0; + + server.on('connection', function(socket) { + child.send({ cmd: 'new' }, socket); + sockets.push(socket); + + if (sockets.length === count) { + closeSockets(0); + } + }); + + let disconnected = 0; + server.on('listening', function() { + let j = count; + while (j--) { + const client = net.connect(server.address().port, '127.0.0.1'); + client.on('close', function() { + disconnected += 1; + }); + } + }); + + let subprocessKilled = false; + function closeSockets(i) { + if (i === count) { + subprocessKilled = true; + server.close(); + child.kill(); + return; + } + + child.once('message', function(m) { + assert.strictEqual(m.status, 'closed'); + server.getConnections(function(err, num) { + closeSockets(i + 1); + }); + }); + sent++; + child.send({ id: i, cmd: 'close' }); + } + + let closeEmitted = false; + server.on('close', function() { + closeEmitted = true; + }); + + server.listen(0, '127.0.0.1'); + + process.on('exit', function() { + assert.strictEqual(sent, count); + assert.strictEqual(disconnected, count); + assert.ok(closeEmitted); + console.log('ok'); + }); +} diff --git a/test/sequential/test-child-process-fork-getconnections.js b/test/sequential/test-child-process-fork-getconnections.js deleted file mode 100644 index 1b1ba9c0d9..0000000000 --- a/test/sequential/test-child-process-fork-getconnections.js +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -'use strict'; -require('../common'); -const assert = require('assert'); -const fork = require('child_process').fork; -const net = require('net'); -const count = 12; - -if (process.argv[2] === 'child') { - const sockets = []; - - process.on('message', function(m, socket) { - function sendClosed(id) { - process.send({ id: id, status: 'closed' }); - } - - if (m.cmd === 'new') { - assert(socket); - assert(socket instanceof net.Socket, 'should be a net.Socket'); - sockets.push(socket); - } - - if (m.cmd === 'close') { - assert.strictEqual(socket, undefined); - if (sockets[m.id].destroyed) { - // Workaround for https://github.com/nodejs/node/issues/2610 - sendClosed(m.id); - // End of workaround. When bug is fixed, this code can be used instead: - // throw new Error('socket destroyed unexpectedly!'); - } else { - sockets[m.id].once('close', sendClosed.bind(null, m.id)); - sockets[m.id].destroy(); - } - } - }); - -} else { - const child = fork(process.argv[1], ['child']); - - child.on('exit', function(code, signal) { - if (!subprocessKilled) - throw new Error('subprocess died unexpectedly!'); - }); - - const server = net.createServer(); - const sockets = []; - let sent = 0; - - server.on('connection', function(socket) { - child.send({ cmd: 'new' }, socket); - sockets.push(socket); - - if (sockets.length === count) { - closeSockets(0); - } - }); - - let disconnected = 0; - server.on('listening', function() { - let j = count; - while (j--) { - const client = net.connect(server.address().port, '127.0.0.1'); - client.on('close', function() { - disconnected += 1; - }); - } - }); - - let subprocessKilled = false; - function closeSockets(i) { - if (i === count) { - subprocessKilled = true; - server.close(); - child.kill(); - return; - } - - child.once('message', function(m) { - assert.strictEqual(m.status, 'closed'); - server.getConnections(function(err, num) { - closeSockets(i + 1); - }); - }); - sent++; - child.send({ id: i, cmd: 'close' }); - } - - let closeEmitted = false; - server.on('close', function() { - closeEmitted = true; - }); - - server.listen(0, '127.0.0.1'); - - process.on('exit', function() { - assert.strictEqual(sent, count); - assert.strictEqual(disconnected, count); - assert.ok(closeEmitted); - console.log('ok'); - }); -} -- cgit v1.2.3