summaryrefslogtreecommitdiff
path: root/test/parallel/test-net-keepalive.js
diff options
context:
space:
mode:
authorImran Iqbal <imrani@ca.ibm.com>2015-10-20 16:58:16 -0400
committerJames M Snell <jasnell@gmail.com>2015-10-21 12:43:04 -0700
commit87d42b08ca2bed004e2e1c5e559161f1e8c5f0c6 (patch)
tree079912e4229a460f984510460e15dab62d978f3e /test/parallel/test-net-keepalive.js
parent60a3dd481044d4d01d41779942bfa725fea96f39 (diff)
downloadandroid-node-v8-87d42b08ca2bed004e2e1c5e559161f1e8c5f0c6.tar.gz
android-node-v8-87d42b08ca2bed004e2e1c5e559161f1e8c5f0c6.tar.bz2
android-node-v8-87d42b08ca2bed004e2e1c5e559161f1e8c5f0c6.zip
test: fix test-net-keepalive for AIX
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
Diffstat (limited to 'test/parallel/test-net-keepalive.js')
-rw-r--r--test/parallel/test-net-keepalive.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/parallel/test-net-keepalive.js b/test/parallel/test-net-keepalive.js
index efbbc5ea79..b05537ba05 100644
--- a/test/parallel/test-net-keepalive.js
+++ b/test/parallel/test-net-keepalive.js
@@ -4,8 +4,17 @@ var assert = require('assert');
var net = require('net');
var serverConnection;
+var clientConnection;
var echoServer = net.createServer(function(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);
assert.notEqual(connection.setKeepAlive, undefined);
// send a keepalive packet after 50 ms
@@ -17,15 +26,6 @@ var echoServer = net.createServer(function(connection) {
echoServer.listen(common.PORT);
echoServer.on('listening', function() {
- var clientConnection = net.createConnection(common.PORT);
+ clientConnection = net.createConnection(common.PORT);
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));
});