Fix beta specific xpcshell bustage from bug 1152245. r+a=bustage-fix
authorMark Banner <standard8@mozilla.com>
Thu, 09 Apr 2015 16:47:18 +0100
changeset 258408 d13016a31d6f
parent 258407 58dca3f7560a
child 258409 d46cb3b3ebb3
push id4660
push usermbanner@mozilla.com
push date2015-04-09 15:47 +0000
treeherdermozilla-beta@d13016a31d6f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1152245
milestone38.0
Fix beta specific xpcshell bustage from bug 1152245. r+a=bustage-fix
browser/components/loop/test/xpcshell/test_loopservice_busy.js
--- a/browser/components/loop/test/xpcshell/test_loopservice_busy.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_busy.js
@@ -29,16 +29,17 @@ add_task(function* test_busy_2guest_call
 
   yield MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.GUEST);
 
   let opened = 0;
   let windowId;
   Chat.open = function(contentWindow, origin, title, url) {
     opened++;
     windowId = url.match(/about:loopconversation\#(\d+)$/)[1];
+    return windowId;
   };
 
   mockPushHandler.notify(1, MozLoopService.channelIDs.callsGuest);
 
   yield waitForCondition(() => { return actionReceived && opened > 0; }).then(() => {
     do_check_true(opened === 1, "should open only one chat window");
     do_check_true(actionReceived, "should respond with busy/reject to second call");
     LoopCalls.clearCallInProgress(windowId);
@@ -53,16 +54,17 @@ add_task(function* test_busy_1fxa_1guest
   yield MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.GUEST);
   yield MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.FXA);
 
   let opened = 0;
   let windowId;
   Chat.open = function(contentWindow, origin, title, url) {
     opened++;
     windowId = url.match(/about:loopconversation\#(\d+)$/)[1];
+    return windowId;
   };
 
   mockPushHandler.notify(1, MozLoopService.channelIDs.callsFxA);
   mockPushHandler.notify(1, MozLoopService.channelIDs.callsGuest);
 
   yield waitForCondition(() => { return actionReceived && opened > 0; }).then(() => {
     do_check_true(opened === 1, "should open only one chat window");
     do_check_true(actionReceived, "should respond with busy/reject to second call");
@@ -102,16 +104,17 @@ add_task(function* test_busy_1guest_1fxa
   yield MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.GUEST);
   yield MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.FXA);
 
   let opened = 0;
   let windowId;
   Chat.open = function(contentWindow, origin, title, url) {
     opened++;
     windowId = url.match(/about:loopconversation\#(\d+)$/)[1];
+    return windowId;
   };
 
   mockPushHandler.notify(1, MozLoopService.channelIDs.callsGuest);
   mockPushHandler.notify(1, MozLoopService.channelIDs.callsFxA);
 
   yield waitForCondition(() => { return actionReceived && opened > 0; }).then(() => {
     do_check_true(opened === 1, "should open only one chat window");
     do_check_true(actionReceived, "should respond with busy/reject to second call");