Skip to content

Commit

Permalink
test: use log only in test-child-process-fork-net
Browse files Browse the repository at this point in the history
We are currently having issues with test-child-process-fork-net on
Windows CI. Debugging is slightly hampered by the mix of `console.log()`
and `console.error()` as our test runner does not interleave stdout and
stderr, so the order of output is not preserved. Change the sole
instance of `console.error()` to `console.log()` to improve
debugability.

While editing, I also took the opportunity to add capitalization and
punctuation to comments (as that is a nit we see from time to time and
there is a potential ESLint rule to enforce the capitalization part).

PR-URL: #20873
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
Trott authored and targos committed May 25, 2018
1 parent ed84b7d commit 443d60a
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions test/parallel/test-child-process-fork-net.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const assert = require('assert');
const fork = require('child_process').fork;
const net = require('net');

// progress tracker
function ProgressTracker(missing, callback) {
this.missing = missing;
this.callback = callback;
Expand Down Expand Up @@ -54,7 +53,7 @@ if (process.argv[2] === 'child') {
socket.destroy();
});

// start making connection from parent
// Start making connection from parent.
console.log('CHILD: server listening');
process.send({ what: 'listening' });
});
Expand Down Expand Up @@ -86,10 +85,10 @@ if (process.argv[2] === 'child') {
assert.strictEqual(code, 0, message);
}));

// send net.Server to child and test by connecting
// Send net.Server to child and test by connecting.
function testServer(callback) {

// destroy server execute callback when done
// Destroy server execute callback when done.
const progress = new ProgressTracker(2, function() {
server.on('close', function() {
console.log('PARENT: server closed');
Expand All @@ -98,11 +97,11 @@ if (process.argv[2] === 'child') {
server.close();
});

// we expect 4 connections and close events
// We expect 4 connections and close events.
const connections = new ProgressTracker(4, progress.done.bind(progress));
const closed = new ProgressTracker(4, progress.done.bind(progress));

// create server and send it to child
// Create server and send it to child.
const server = net.createServer();
server.on('connection', function(socket) {
console.log('PARENT: got connection');
Expand All @@ -115,11 +114,11 @@ if (process.argv[2] === 'child') {
});
server.listen(0);

// handle client messages
// Handle client messages.
function messageHandlers(msg) {

if (msg.what === 'listening') {
// make connections
// Make connections.
let socket;
for (let i = 0; i < 4; i++) {
socket = net.connect(server.address().port, function() {
Expand All @@ -143,11 +142,11 @@ if (process.argv[2] === 'child') {
child.on('message', messageHandlers);
}

// send net.Socket to child
// Send net.Socket to child.
function testSocket(callback) {

// create a new server and connect to it,
// but the socket will be handled by the child
// Create a new server and connect to it,
// but the socket will be handled by the child.
const server = net.createServer();
server.on('connection', function(socket) {
socket.on('close', function() {
Expand All @@ -159,14 +158,14 @@ if (process.argv[2] === 'child') {
console.log('PARENT: server closed');
callback();
});
// don't listen on the same port, because SmartOS sometimes says
// Don't listen on the same port, because SmartOS sometimes says
// that the server's fd is closed, but it still cannot listen
// on the same port again.
//
// An isolated test for this would be lovely, but for now, this
// will have to do.
server.listen(0, function() {
console.error('testSocket, listening');
console.log('testSocket, listening');
const connect = net.connect(server.address().port);
let store = '';
connect.on('data', function(chunk) {
Expand All @@ -181,7 +180,7 @@ if (process.argv[2] === 'child') {
});
}

// create server and send it to child
// Create server and send it to child.
let serverSuccess = false;
let socketSuccess = false;
child.on('message', function onReady(msg) {
Expand Down

0 comments on commit 443d60a

Please sign in to comment.