From 6dbc8a876a82cef2d4a5944ef71fd9faf12b2a0b Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 1 Dec 2015 13:13:40 -0800
Subject: [PATCH] test: fix flaky test-net-socket-local-address

test-net-socket-local-address had a race condition that resulted in
unreliability on FreeBSD and Windows. This changes fixes the issue.

Fixes: https://github.com/nodejs/node/issues/2475
---
 test/parallel/parallel.status                 |  1 -
 .../parallel/test-net-socket-local-address.js | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index bce36b53bbe5d2..b30ec2a7dc019f 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -21,4 +21,3 @@ test-child-process-exit-code         : PASS,FLAKY
 [$system==solaris] # Also applies to SmartOS
 
 [$system==freebsd]
-test-net-socket-local-address     : PASS,FLAKY
diff --git a/test/parallel/test-net-socket-local-address.js b/test/parallel/test-net-socket-local-address.js
index 502c2d226d54b8..b29cc41c71a199 100644
--- a/test/parallel/test-net-socket-local-address.js
+++ b/test/parallel/test-net-socket-local-address.js
@@ -15,7 +15,7 @@ var serverRemotePorts = [];
 
 const server = net.createServer(function(socket) {
   serverRemotePorts.push(socket.remotePort);
-  conns++;
+  testConnect();
 });
 
 const client = new net.Socket();
@@ -29,12 +29,17 @@ server.on('close', common.mustCall(function() {
 server.listen(common.PORT, common.localhostIPv4, testConnect);
 
 function testConnect() {
-  if (conns == 2) {
+  if (conns === 2) {
     return server.close();
   }
-  client.connect(common.PORT, common.localhostIPv4, function() {
-    clientLocalPorts.push(this.localPort);
-    this.once('close', testConnect);
-    this.destroy();
-  });
+  // conns === clientLocalPorts.length means both server and client callbacks
+  // have fired
+  if (conns === clientLocalPorts.length) {
+    client.connect(common.PORT, common.localhostIPv4, function() {
+      clientLocalPorts.push(this.localPort);
+      this.once('close', testConnect);
+      this.destroy();
+    });
+  }
+  conns++;
 }