1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix test-net-socket-constructor

Browse Source 
So it doesn't fail when creating a socket whose `fd` is already
being watched. Test that functionality now inside a cluster
worker.

Refs: https://github.com/libuv/libuv/pull/1851
Refs: https://github.com/libuv/libuv/issues/1897
PR-URL: https://github.com/nodejs/node/pull/21466
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Santiago Gimeno 2018-06-21 10:01:43 +02:00 committed by cjihrig
parent cb261c8648
commit 49e5f0a10f
No known key found for this signature in database
GPG Key ID: 7434390BDBE9B9C5
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
test/parallel/test-net-socket-constructor.js
View File

@ -2,6 +2,7 @@
const common = require('../common'); const common = require('../common');
const assert = require('assert'); const assert = require('assert');
const cluster = require('cluster');
const net = require('net'); const net = require('net');
common.expectsError(() => { common.expectsError(() => {
@ -25,27 +26,40 @@ function test(sock, readable, writable) {
assert.strictEqual(socket.writable, writable); assert.strictEqual(socket.writable, writable);
} }
test(undefined, false, false); if (cluster.isMaster) {
test(undefined, false, false);
const server = net.createServer(common.mustCall((socket) => { const server = net.createServer(common.mustCall((socket) => {
test(socket, true, true); socket.unref();
test({ handle: socket._handle }, false, false);
test({ handle: socket._handle, readable: true, writable: true }, true, true);
if (socket._handle.fd >= 0) {
test(socket._handle.fd, false, false);
test({ fd: socket._handle.fd }, false, false);
test({ fd: socket._handle.fd, readable: true, writable: true }, true, true);
}
server.close();
}));
server.listen(common.mustCall(() => {
const { port } = server.address();
const socket = net.connect(port, common.mustCall(() => {
test(socket, true, true); test(socket, true, true);
socket.end(); test({ handle: socket._handle }, false, false);
test({ handle: socket._handle, readable: true, writable: true },
true, true);
server.close();
})); }));
test(socket, false, true); server.listen(common.mustCall(() => {
})); const { port } = server.address();
const socket = net.connect(port, common.mustCall(() => {
test(socket, true, true);
socket.end();
}));
test(socket, false, true);
}));
cluster.setupMaster({
stdio: ['pipe', 'pipe', 'pipe', 'ipc', 'pipe', 'pipe', 'pipe']
});
const worker = cluster.fork();
worker.on('exit', common.mustCall((code, signal) => {
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);
}));
} else {
test(4, false, false);
test({ fd: 5 }, false, false);
test({ fd: 6, readable: true, writable: true }, true, true);
process.disconnect();
}