Skip to content

Commit

Permalink
test: remove 1 second delay from test
Browse files Browse the repository at this point in the history
In test-cluster-worker-wait-server-close, remove unneeded 1-second delay
and refactor to eliminate flakiness on FreeBSD.

PR-URL: #4616
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott authored and Myles Borins committed Jan 28, 2016
1 parent 6630994 commit fffaa2f
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions test/parallel/test-cluster-worker-wait-server-close.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,44 @@ var assert = require('assert');
var cluster = require('cluster');
var net = require('net');

var serverClosed = false;

if (cluster.isWorker) {
net.createServer(function(socket) {
var server = net.createServer(function(socket) {
// Wait for any data, then close connection
socket.write('.');
socket.on('data', function discard() {
});
socket.on('data', function discard() {});
}).listen(common.PORT, common.localhostIPv4);
} else if (cluster.isMaster) {

var connectionDone;
var ok;
server.once('close', function() {
serverClosed = true;
});

// Although not typical, the worker process can exit before the disconnect
// event fires. Use this to keep the process open until the event has fired.
var keepOpen = setInterval(function() {}, 9999);

// Check worker events and properties
process.once('disconnect', function() {
// disconnect should occur after socket close
assert(serverClosed);
clearInterval(keepOpen);
});
} else if (cluster.isMaster) {
// start worker
var worker = cluster.fork();

var socket;
// Disconnect worker when it is ready
worker.once('listening', function() {
net.createConnection(common.PORT, common.localhostIPv4, function() {
var socket = this;
socket = this;
this.on('data', function() {
console.log('got data from client');
// socket definitely connected to worker if we got data
worker.disconnect();
setTimeout(function() {
socket.end();
connectionDone = true;
}, 1000);
socket.end();
});
});
});

// Check worker events and properties
worker.once('disconnect', function() {
assert.ok(connectionDone, 'disconnect should occur after socket close');
ok = true;
});

process.once('exit', function() {
assert.ok(ok);
});
}

0 comments on commit fffaa2f

Please sign in to comment.