test: update dgram tests after API change

diff --git a/test/simple/test-dgram-broadcast-multi-process.js b/test/simple/test-dgram-broadcast-multi-process.js
index adbdc41..ad5b4eb 100644 (file)
--- a/test/simple/test-dgram-broadcast-multi-process.js
+++ b/test/simple/test-dgram-broadcast-multi-process.js
@@ -162,7 +162,9 @@ if (process.argv[2] !== 'child') {
   // bind the address explicitly for sending
   // INADDR_BROADCAST to only one interface
   sendSocket.bind(common.PORT, bindAddress);
-  sendSocket.setBroadcast(true);
+  sendSocket.on('listening', function () {
+    sendSocket.setBroadcast(true);
+  });
 
   sendSocket.on('close', function() {
     console.error('[PARENT] sendSocket closed');

diff --git a/test/simple/test-dgram-listen-after-bind.js b/test/simple/test-dgram-listen-after-bind.js
new file mode 100644 (file)
index 0000000..e5f1c4d
--- /dev/null
+++ b/test/simple/test-dgram-listen-after-bind.js
@@ -0,0 +1,43 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var dgram = require('dgram');
+
+var socket = dgram.createSocket('udp4');
+
+socket.bind();
+
+var fired = false;
+var timer = setTimeout(function () {
+  socket.close();
+}, 100);
+
+socket.on('listening', function () {
+  clearTimeout(timer);
+  fired = true;
+  socket.close();
+});
+
+socket.on('close', function () {
+  assert(fired, 'listening should fire after bind');
+});

diff --git a/test/simple/test-dgram-multicast-multi-process.js b/test/simple/test-dgram-multicast-multi-process.js
index 4f07820..86fd7d7 100644 (file)
--- a/test/simple/test-dgram-multicast-multi-process.js
+++ b/test/simple/test-dgram-multicast-multi-process.js
@@ -149,10 +149,13 @@ if (process.argv[2] !== 'child') {
   // call is what creates the actual socket...
   sendSocket.bind();
 
-  sendSocket.setTTL(1);
-  sendSocket.setBroadcast(true);
-  sendSocket.setMulticastTTL(1);
-  sendSocket.setMulticastLoopback(true);
+  // The socket is actually created async now
+  sendSocket.on('listening', function () {
+    sendSocket.setTTL(1);
+    sendSocket.setBroadcast(true);
+    sendSocket.setMulticastTTL(1);
+    sendSocket.setMulticastLoopback(true);
+  });
 
   sendSocket.on('close', function() {
     console.error('[PARENT] sendSocket closed');
@@ -221,5 +224,7 @@ if (process.argv[2] === 'child') {
 
   listenSocket.bind(common.PORT);
 
-  listenSocket.addMembership(LOCAL_BROADCAST_HOST);
+  listenSocket.on('listening', function () {
+    listenSocket.addMembership(LOCAL_BROADCAST_HOST);
+  });
 }

diff --git a/test/simple/test-dgram-multicast-setTTL.js b/test/simple/test-dgram-multicast-setTTL.js
index 8d1c0a0..2ef0c16 100644 (file)
--- a/test/simple/test-dgram-multicast-setTTL.js
+++ b/test/simple/test-dgram-multicast-setTTL.js
@@ -26,16 +26,18 @@ var common = require('../common'),
     socket = dgram.createSocket('udp4');
 
 socket.bind(common.PORT);
-socket.setMulticastTTL(16);
+socket.on('listening', function () {
+  socket.setMulticastTTL(16);
 
-//Try to set an invalid TTL (valid ttl is > 0 and < 256)
-try {
-  socket.setMulticastTTL(1000);
-} catch (e) {
-  thrown = true;
-}
+  //Try to set an invalid TTL (valid ttl is > 0 and < 256)
+  try {
+    socket.setMulticastTTL(1000);
+  } catch (e) {
+    thrown = true;
+  }
 
-assert(thrown, 'Setting an invalid multicast TTL should throw some error');
+  assert(thrown, 'Setting an invalid multicast TTL should throw some error');
 
-//close the socket
-socket.close();
+  //close the socket
+  socket.close();
+});