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

test: fix test-net-keepalive for AIX

Browse Source 
Fixed an intermittent issue on AIX where the 100ms timeout was reached
before the 'connection' event was fired. This resulted in a failure as
serverConnection would be undefined and the assert.equal would throw an
error. Changed the flow of the test so that the timeout is only set
after a connection has been made.

Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
PR-URL: https://github.com/nodejs/node/pull/3458
This commit is contained in:
Imran Iqbal 2015-10-20 16:58:16 -04:00 committed by James M Snell
parent 60a3dd4810
commit 87d42b08ca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/parallel/test-net-keepalive.js
View File

@ -4,8 +4,17 @@ var assert = require('assert');
var net = require('net'); var net = require('net');
var serverConnection; var serverConnection;
var clientConnection;
var echoServer = net.createServer(function(connection) { var echoServer = net.createServer(function(connection) {
serverConnection = connection; serverConnection = connection;
setTimeout(function() {
// make sure both connections are still open
assert.equal(serverConnection.readyState, 'open');
assert.equal(clientConnection.readyState, 'open');
serverConnection.end();
clientConnection.end();
echoServer.close();
}, common.platformTimeout(100));
connection.setTimeout(0); connection.setTimeout(0);
assert.notEqual(connection.setKeepAlive, undefined); assert.notEqual(connection.setKeepAlive, undefined);
// send a keepalive packet after 50 ms // send a keepalive packet after 50 ms
@ -17,15 +26,6 @@ var echoServer = net.createServer(function(connection) {
echoServer.listen(common.PORT); echoServer.listen(common.PORT);
echoServer.on('listening', function() { echoServer.on('listening', function() {
var clientConnection = net.createConnection(common.PORT); clientConnection = net.createConnection(common.PORT);
clientConnection.setTimeout(0); clientConnection.setTimeout(0);
setTimeout(function() {
// make sure both connections are still open
assert.equal(serverConnection.readyState, 'open');
assert.equal(clientConnection.readyState, 'open');
serverConnection.end();
clientConnection.end();
echoServer.close();
}, common.platformTimeout(100));
}); });