Added callback to io.listen.

Removed race condition in websocket room tests (for real this time)
taariq · Jun 12, 2011 · b9ab031 · b9ab031
1 parent 7d2efd9
commit b9ab031
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 8 deletions.
diff --git a/lib/socket.io.js b/lib/socket.io.js
@@ -37,7 +37,12 @@ exports.clientVersion = client.version;
  * @api public
  */
 
-exports.listen = function (server, options) {
+exports.listen = function (server, options, fn) {
+  if ('function' == typeof options) {
+    fn = options;
+    options = {};
+  }
+
   if ('undefined' == typeof server) {
     // create a server that listens on port 80
     server = 80;
@@ -58,7 +63,7 @@ exports.listen = function (server, options) {
       res.end('Welcome to socket.io.');
     });
 
-    server.listen(port);
+    server.listen(port, fn);
   }
 
   // otherwise assume a http/s server

diff --git a/test/transports.websocket.test.js b/test/transports.websocket.test.js
@@ -729,9 +729,12 @@ module.exports = {
           });
 
           messages++;
-          ws1.finishClose();
         }
       });
+
+      setTimeout(function () {
+        ws1.finishClose();
+      }, 50);
     });
 
     cl2.handshake(function (sid) {
@@ -748,9 +751,12 @@ module.exports = {
           });
 
           messages++;
-          ws2.finishClose();
         }
       });
+
+      setTimeout(function () {
+        ws2.finishClose();
+      }, 50);
     });
 
     cl3.handshake(function (sid) {
@@ -760,6 +766,12 @@ module.exports = {
           msg.type.should.eql('connect');
           ws3.connected = true;
         } else {
+          msg.should.eql({
+              type: 'message'
+            , data: 'hahaha'
+            , endpoint: ''
+          });
+
           messages++;
         }
       });
@@ -829,9 +841,12 @@ module.exports = {
           });
 
           messages++;
-          ws1.finishClose();
         }
       });
+
+      setTimeout(function () {
+        ws1.finishClose();
+      }, 50);
     });
 
     cl2.handshake(function (sid) {
@@ -848,9 +863,12 @@ module.exports = {
           });
 
           messages++;
-          ws2.finishClose();
         }
       });
+
+      setTimeout(function () {
+        ws2.finishClose();
+      }, 50);
     });
 
     cl3.handshake(function (sid) {
@@ -860,6 +878,12 @@ module.exports = {
           msg.type.should.eql('connect');
           ws3.connected = true;
         } else {
+          msg.should.eql({
+              type: 'json'
+            , data: 123
+            , endpoint: ''
+          });
+
           messages++;
         }
       });
@@ -930,9 +954,12 @@ module.exports = {
           });
 
           messages++;
-          ws1.finishClose();
         }
       });
+
+      setTimeout(function () {
+        ws1.finishClose();
+      }, 50);
     });
 
     cl2.handshake(function (sid) {
@@ -950,9 +977,12 @@ module.exports = {
           });
 
           messages++;
-          ws2.finishClose();
         }
       });
+
+      setTimeout(function () {
+        ws2.finishClose();
+      }, 50);
     });
 
     cl3.handshake(function (sid) {
@@ -962,6 +992,13 @@ module.exports = {
           msg.type.should.eql('connect');
           ws3.connected = true;
         } else {
+          msg.should.eql({
+              type: 'event'
+            , name: 'locki'
+            , args: []
+            , endpoint: ''
+          });
+
           messages++;
         }
       });