From f552fdec14de0a5cf3993633d7dd9e70249f724f Mon Sep 17 00:00:00 2001
From: Dragana Damjanovic <dd.mozilla@gmail.com>
Date: Wed, 4 Mar 2015 02:34:00 +0100
Subject: [PATCH] Bug 1135405 - Use different multicast addresses for each
 test. r=michal, a=sledru

---
 netwerk/test/unit/test_udp_multicast.js | 34 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/netwerk/test/unit/test_udp_multicast.js b/netwerk/test/unit/test_udp_multicast.js
index 5e63f075312f..b014e2186248 100644
--- a/netwerk/test/unit/test_udp_multicast.js
+++ b/netwerk/test/unit/test_udp_multicast.js
@@ -7,7 +7,11 @@ const UDPSocket = CC("@mozilla.org/network/udp-socket;1",
                      "init");
 const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 
-const ADDRESS = "224.0.0.255";
+const ADDRESS_TEST1 = "224.0.0.200";
+const ADDRESS_TEST2 = "224.0.0.201";
+const ADDRESS_TEST3 = "224.0.0.202";
+const ADDRESS_TEST4 = "224.0.0.203";
+
 const TIMEOUT = 2000;
 
 const ua = Cc["@mozilla.org/network/protocol;1?name=http"]
@@ -27,13 +31,13 @@ function setup() {
   gConverter.charset = "utf8";
 }
 
-function createSocketAndJoin() {
+function createSocketAndJoin(addr) {
   let socket = new UDPSocket(-1, false);
-  socket.joinMulticast(ADDRESS);
+  socket.joinMulticast(addr);
   return socket;
 }
 
-function sendPing(socket) {
+function sendPing(socket, addr) {
   let ping = "ping";
   let rawPing = gConverter.convertToByteArray(ping);
 
@@ -50,7 +54,7 @@ function sendPing(socket) {
   });
 
   do_print("Multicast send to port " + socket.port);
-  socket.send(ADDRESS, socket.port, rawPing, rawPing.length);
+  socket.send(addr, socket.port, rawPing, rawPing.length);
 
   // Timers are bad, but it seems like the only way to test *not* getting a
   // packet.
@@ -65,8 +69,8 @@ function sendPing(socket) {
 
 add_test(() => {
   do_print("Joining multicast group");
-  let socket = createSocketAndJoin();
-  sendPing(socket).then(
+  let socket = createSocketAndJoin(ADDRESS_TEST1);
+  sendPing(socket, ADDRESS_TEST1).then(
     run_next_test,
     () => do_throw("Joined group, but no packet received")
   );
@@ -74,9 +78,9 @@ add_test(() => {
 
 add_test(() => {
   do_print("Disabling multicast loopback");
-  let socket = createSocketAndJoin();
+  let socket = createSocketAndJoin(ADDRESS_TEST2);
   socket.multicastLoopback = false;
-  sendPing(socket).then(
+  sendPing(socket, ADDRESS_TEST2).then(
     () => do_throw("Loopback disabled, but still got a packet"),
     run_next_test
   );
@@ -88,21 +92,21 @@ add_test(() => {
 if (!isWinXP) {
   add_test(() => {
     do_print("Changing multicast interface");
-    let socket = createSocketAndJoin();
+    let socket = createSocketAndJoin(ADDRESS_TEST3);
     socket.multicastInterface = "127.0.0.1";
-    sendPing(socket).then(
+    sendPing(socket, ADDRESS_TEST3).then(
       () => do_throw("Changed interface, but still got a packet"),
       run_next_test
     );
   });
-}
 
 add_test(() => {
   do_print("Leaving multicast group");
-  let socket = createSocketAndJoin();
-  socket.leaveMulticast(ADDRESS);
-  sendPing(socket).then(
+  let socket = createSocketAndJoin(ADDRESS_TEST4);
+  socket.leaveMulticast(ADDRESS_TEST4);
+  sendPing(socket, ADDRESS_TEST4).then(
     () => do_throw("Left group, but still got a packet"),
     run_next_test
   );
 });
+}