Adjust passing-FDs test to wait until socket is really writeable

nodejs · Jan 22, 2010 · 6f738d6 · 6f738d6
1 parent 2788064
commit 6f738d6
Showing 1 changed file with 29 additions and 25 deletions.
diff --git a/test/mjsunit/test-net-fd-passing.js b/test/mjsunit/test-net-fd-passing.js
@@ -12,43 +12,47 @@ function fdPassingTest(path, port) {
   var message = "beep toot";
   var expectedData = ["[greeting] " + greeting, "[echo] " + message];
 
-  puts(fixturesDir);
   var receiverArgs = [fixturesDir + "/net-fd-passing-receiver.js", path, greeting];
   var receiver = process.createChildProcess(process.ARGV[0], receiverArgs);
 
   var initializeSender = function() {
     var fdHighway = new net.Socket();
-    fdHighway.connect(path);
 
-    var sender = net.createServer(function(socket) {
-      fdHighway.sendFD(socket);
-      socket.flush();
-      socket.forceClose(); // want to close() the fd, not shutdown()
-    });
+    fdHighway.addListener("connect", function() {
+      var sender = net.createServer(function(socket) {
+        fdHighway.sendFD(socket);
+        socket.flush();
+        socket.forceClose(); // want to close() the fd, not shutdown()
+      });
 
-    sender.addListener("listening", function() {
-      var client = net.createConnection(port);
+      sender.addListener("listening", function() {
+        var client = net.createConnection(port);
 
-      client.addListener("connect", function() {
-        client.send(message);
-      });
+        client.addListener("connect", function() {
+          client.send(message);
+        });
 
-      client.addListener("data", function(data) {
-        assert.equal(expectedData[0], data);
-        if (expectedData.length > 1) {
-          expectedData.shift();
-        }
-        else {
-          // time to shut down
-          fdHighway.close();
-          sender.close();
-          client.forceClose();
-        }
+        client.addListener("data", function(data) {
+          assert.equal(expectedData[0], data);
+          if (expectedData.length > 1) {
+            expectedData.shift();
+          }
+          else {
+            // time to shut down
+            fdHighway.close();
+            sender.close();
+            client.forceClose();
+          }
+        });
       });
+
+      tests_run += 1;
+      sender.listen(port);
     });
 
-    tests_run += 1;
-    sender.listen(port);
+    fdHighway.connect(path);
+
+
   };
 
   receiver.addListener("output", function(data) {