summaryrefslogtreecommitdiff
path: root/test/parallel/test-net-persistent-keepalive.js
diff options
context:
space:
mode:
authorImran Iqbal <imrani@ca.ibm.com>2015-11-03 11:10:16 -0500
committerJames M Snell <jasnell@gmail.com>2015-11-04 15:18:49 -0800
commita6a7338b1c1bce5276a86933a4b3553593f24b64 (patch)
tree056943de095619f6acbce87b7342e32b5d32a803 /test/parallel/test-net-persistent-keepalive.js
parent471aa5a9897ad38df3ec8da163ad7d75ef765527 (diff)
downloadandroid-node-v8-a6a7338b1c1bce5276a86933a4b3553593f24b64.tar.gz
android-node-v8-a6a7338b1c1bce5276a86933a4b3553593f24b64.tar.bz2
android-node-v8-a6a7338b1c1bce5276a86933a4b3553593f24b64.zip
test: fix test-net-persistent-keepalive for AIX
Fixed an intermittent issue on AIX where the 600ms 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. PR-URL: https://github.com/nodejs/node/pull/3646 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test/parallel/test-net-persistent-keepalive.js')
-rw-r--r--test/parallel/test-net-persistent-keepalive.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/parallel/test-net-persistent-keepalive.js b/test/parallel/test-net-persistent-keepalive.js
index a54833a8f5..fccfb69c4b 100644
--- a/test/parallel/test-net-persistent-keepalive.js
+++ b/test/parallel/test-net-persistent-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();
+ }, 600);
connection.setTimeout(0);
assert.equal(typeof connection.setKeepAlive, 'function');
connection.on('end', function() {
@@ -15,20 +24,11 @@ var echoServer = net.createServer(function(connection) {
echoServer.listen(common.PORT);
echoServer.on('listening', function() {
- var clientConnection = new net.Socket();
+ clientConnection = new net.Socket();
// send a keepalive packet after 1000 ms
// and make sure it persists
var s = clientConnection.setKeepAlive(true, 400);
assert.ok(s instanceof net.Socket);
clientConnection.connect(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();
- }, 600);
});