Bug 1135405 - Use different multicast addresses for each test. r=michal, a=sledru

This commit is contained in:
Dragana Damjanovic
2015-03-04 02:34:00 +01:00
parent 5c2a545c49
commit f552fdec14

View File

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