From c63258413f298f02195626528b757e935a784458 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 27 May 2015 22:46:12 -0700
Subject: [PATCH] test: check error type in net.Server.listen() callback and
 avoid setTimeout() in test

---
 test/parallel/test-net-server-try-ports.js | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/test/parallel/test-net-server-try-ports.js b/test/parallel/test-net-server-try-ports.js
index 65cd5887a1356d..a7f84744cbdfdd 100644
--- a/test/parallel/test-net-server-try-ports.js
+++ b/test/parallel/test-net-server-try-ports.js
@@ -9,6 +9,7 @@ var connections = 0;
 
 var server1listening = false;
 var server2listening = false;
+var server2eaddrinuse = false;
 
 var server1 = net.Server(function(socket) {
   connections++;
@@ -21,36 +22,37 @@ 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();
+  });
 });
 
 
 server1.listen(common.PORT, function() {
   console.error('server1 listening');
   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);
 });