Skip to content

Commit

Permalink
test: refactor test-net-connect-options-ipv6
Browse files Browse the repository at this point in the history
Remove unused variable and refactor checking for event firing.

PR-URL: nodejs#4395
Reviewed-By: Brian White <mscdex@mscdex.net>
  • Loading branch information
Trott authored and Fishrock123 committed Jan 6, 2016
1 parent 8742090 commit 8c9d0c1
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions test/parallel/test-net-connect-options-ipv6.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,20 @@
const common = require('../common');
const assert = require('assert');
const net = require('net');
const dns = require('dns');

if (!common.hasIPv6) {
console.log('1..0 # Skipped: no IPv6 support');
return;
}

var serverGotEnd = false;
var clientGotEnd = false;

const hosts = common.localIPv6Hosts;
var hostIdx = 0;
var host = hosts[hostIdx];
var localhostTries = 10;

const server = net.createServer({allowHalfOpen: true}, function(socket) {
socket.resume();
socket.on('end', function() {
serverGotEnd = true;
});
socket.on('end', common.mustCall(function() {}));
socket.end();
});

Expand All @@ -36,13 +30,12 @@ function tryConnect() {
}, function() {
console.error('client connect cb');
client.resume();
client.on('end', function() {
clientGotEnd = true;
client.on('end', common.mustCall(function() {
setTimeout(function() {
assert(client.writable);
client.end();
}, 10);
});
}));
client.on('close', function() {
server.close();
});
Expand All @@ -54,18 +47,10 @@ function tryConnect() {
tryConnect();
else {
console.log('1..0 # Skipped: no IPv6 localhost support');
process.removeListener('exit', onExit);
server.close();
}
return;
}
throw err;
});
}

process.on('exit', onExit);
function onExit() {
console.error('exit', serverGotEnd, clientGotEnd);
assert(serverGotEnd);
assert(clientGotEnd);
}

0 comments on commit 8c9d0c1

Please sign in to comment.