Skip to content

Commit

Permalink
test: check error type from net.Server.listen()
Browse files Browse the repository at this point in the history
This change eliminates an unnecessary setTimeout() in the test.

PR-URL: nodejs/node#1821
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Brendan Ashworth <brendan.ashworth@me.com>
  • Loading branch information
Trott authored and andrewdeandrade committed Jun 3, 2015
1 parent 3381bb2 commit c209968
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions test/parallel/test-net-server-try-ports.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var connections = 0;

var server1listening = false;
var server2listening = false;
var server2eaddrinuse = false;

var server1 = net.Server(function(socket) {
connections++;
Expand All @@ -21,9 +22,21 @@ var server2 = net.Server(function(socket) {
});

var server2errors = 0;
server2.on('error', function() {
server2.on('error', function(e) {
server2errors++;
console.error('server2 error');

if (e.code == 'EADDRINUSE') {
server2eaddrinuse = true;
}

server2.listen(common.PORT + 1, function() {
console.error('server2 listening');
server2listening = true;

server1.close();
server2.close();
});
});


Expand All @@ -32,25 +45,12 @@ server1.listen(common.PORT, function() {
server1listening = true;
// This should make server2 emit EADDRINUSE
server2.listen(common.PORT);

// Wait a bit, now try again.
// TODO, the listen callback should report if there was an error.
// Then we could avoid this very unlikely but potential race condition
// here.
setTimeout(function() {
server2.listen(common.PORT + 1, function() {
console.error('server2 listening');
server2listening = true;

server1.close();
server2.close();
});
}, 100);
});


process.on('exit', function() {
assert.equal(1, server2errors);
assert.ok(server2eaddrinuse);
assert.ok(server2listening);
assert.ok(server1listening);
});

0 comments on commit c209968

Please sign in to comment.