Bug 1252750 - Part 3: Convert dom/geolocation to use SpecialPowers.spinEventLoop. r=mrbkap
authorDoug Turner <dougt@mozilla.com>
Sat, 05 Mar 2016 00:06:00 -0500
changeset 286950 603aec801c489c83ec0639bedb16cad786de86e8
parent 286949 398a0e720ccf04f65c274eb82821def6f08e046b
child 286951 0148a8583cbcea332809a50d670695dee194655e
push id18025
push userryanvm@gmail.com
push dateSun, 06 Mar 2016 20:04:05 +0000
treeherderfx-team@b6acf4d4fc20 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1252750
milestone47.0a1
Bug 1252750 - Part 3: Convert dom/geolocation to use SpecialPowers.spinEventLoop. r=mrbkap
dom/tests/mochitest/geolocation/mochitest.ini
dom/tests/mochitest/geolocation/test_handlerSpinsEventLoop.html
--- a/dom/tests/mochitest/geolocation/mochitest.ini
+++ b/dom/tests/mochitest/geolocation/mochitest.ini
@@ -20,17 +20,17 @@ skip-if = buildapp == 'b2g' || toolkit =
 [test_clearWatchBeforeAllowing.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 [test_clearWatch_invalid.html]
 skip-if = buildapp == 'b2g'
 [test_errorcheck.html]
 skip-if = toolkit=='gonk' || toolkit == 'android' #TIMED_OUT # b2g-debug(debug-only timeout)
 [test_geolocation_is_undefined_when_pref_is_off.html]
 [test_handlerSpinsEventLoop.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #Don't run modal tests on Android
 [test_manyCurrentConcurrent.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 [test_manyCurrentSerial.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 [test_manyWatchConcurrent.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 [test_manyWatchSerial.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
--- a/dom/tests/mochitest/geolocation/test_handlerSpinsEventLoop.html
+++ b/dom/tests/mochitest/geolocation/test_handlerSpinsEventLoop.html
@@ -33,17 +33,17 @@ resume_geolocationProvider(function() {
 });
 
 function spinEventLoopAndSetTimeout() {
   if (successCallbackCalled || errorCallbackCalled) {
     // this should only be called once from either callback
     return;
   }
 
-  window.showModalDialog("javascript:window.close()");
+  SpecialPowers.spinEventLoop(window);
 
   setTimeout(function() {
     ok(successCallbackCalled != errorCallbackCalled, "Ensure only one callback is called");
     SimpleTest.finish();
   }, 5);
 }
 
 var successCallbackCalled = false;