Bug 1153248, re-enable a bunch of tests that now work with e10s, r=billm

2024-09-13 09:24:08 -07:00 · 2015-04-16 15:38:12 -04:00 · 2015-04-16 15:38:12 -04:00 · dd30a1f3eb
commit dd30a1f3eb
parent 26ca3f5120
31 changed files with 22 additions and 51 deletions
--- a/dom/alarm/test/mochitest.ini
+++ b/dom/alarm/test/mochitest.ini
@ -1,6 +1,4 @@
 [DEFAULT]
-skip-if = e10s
-
 support-files =
  file_empty.html

--- a/dom/base/test/websocket_hybi/mochitest.ini
+++ b/dom/base/test/websocket_hybi/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  file_binary-frames_wsh.py
  file_check-binary-messages_wsh.py
@ -11,4 +10,4 @@ skip-if = buildapp == 'b2g' || toolkit == 'android'
 [test_send-arraybuffer.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android'
 [test_send-blob.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
--- a/dom/battery/test/mochitest.ini
+++ b/dom/battery/test/mochitest.ini
@ -1,5 +1,2 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_battery_basics.html]
 skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
--- a/dom/encoding/test/mochitest.ini
+++ b/dom/encoding/test/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  file_utf16_be_bom.css
  file_utf16_be_bom.js
--- a/dom/json/test/mochitest.ini
+++ b/dom/json/test/mochitest.ini
@ -1,4 +1 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_json.html]
--- a/dom/jsurl/test/mochitest.ini
+++ b/dom/jsurl/test/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  fail.html
  form-submit.html
--- a/dom/media/webaudio/test/browser.ini
+++ b/dom/media/webaudio/test/browser.ini
@ -1,8 +1,8 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  browser_mozAudioChannel.html
  browser_mozAudioChannel_muted.html

 [browser_mozAudioChannel.js]
 [browser_mozAudioChannel_muted.js]
+skip-if = e10s
--- a/dom/messages/test/mochitest.ini
+++ b/dom/messages/test/mochitest.ini
@ -1,5 +1,2 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_bug_993732.html]
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
--- a/dom/mobilemessage/tests/mochitest/mochitest.ini
+++ b/dom/mobilemessage/tests/mochitest/mochitest.ini
@ -1,5 +1,2 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_sms_basics.html]
 skip-if = toolkit == 'android' #Bug 909036
--- a/dom/permission/tests/mochitest.ini
+++ b/dom/permission/tests/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  file_framework.js
  file_shim.html
@ -7,11 +6,11 @@ support-files =
 [test_alarms.html]
 [test_browser.html]
 [test_embed-apps.html]
-skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
+skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
 [test_idle.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
 [test_permission_basics.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(Bug 907770)
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(Bug 907770)
 [test_permissions.html]
 [test_power.html]
 [test_presentation-device-manage.html]
--- a/dom/phonenumberutils/tests/mochitest.ini
+++ b/dom/phonenumberutils/tests/mochitest.ini
@ -1,4 +1 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_phonenumberutils_basics.html]
--- a/dom/power/test/mochitest.ini
+++ b/dom/power/test/mochitest.ini
@ -1,6 +1,3 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_bug957893.html]
 [test_bug957899.html]
 [test_wakelock_not_exposed.html]
--- a/dom/tests/mochitest/ajax/jquery/mochitest.ini
+++ b/dom/tests/mochitest/ajax/jquery/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  manifest.json
  dist/jquery.js
--- a/dom/tests/mochitest/ajax/mochikit/mochitest.ini
+++ b/dom/tests/mochitest/ajax/mochikit/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  manifest.json
  MochiKit/Async.js
--- a/dom/tests/mochitest/ajax/mochikit/tests/mochitest.ini
+++ b/dom/tests/mochitest/ajax/mochikit/tests/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  FakeJSAN.js
  MochiKit-Async.html
--- a/dom/tests/mochitest/ajax/prototype/mochitest.ini
+++ b/dom/tests/mochitest/ajax/prototype/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  manifest.json
  dist/prototype.js
--- a/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini
+++ b/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  manifest.json
  lib/prototype.js
--- a/dom/tests/mochitest/beacon/chrome.ini
+++ b/dom/tests/mochitest/beacon/chrome.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g'

 [test_beaconCookies.html]
 support-files = beacon-set-cookie.sjs
--- a/dom/tests/mochitest/beacon/mochitest.ini
+++ b/dom/tests/mochitest/beacon/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g'
 support-files = beacon-frame.html
                beacon-handler.sjs
                beacon-originheader-handler.sjs
--- a/dom/tests/mochitest/crypto/mochitest.ini
+++ b/dom/tests/mochitest/crypto/mochitest.ini
@ -1,4 +1 @@
-[DEFAULT]
-skip-if = e10s
-
 [test_getRandomValues.html]
--- a/dom/tests/mochitest/gamepad/mochitest.ini
+++ b/dom/tests/mochitest/gamepad/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  gamepad_frame.html
  gamepad_frame_state.html
--- a/dom/tests/mochitest/notification/mochitest.ini
+++ b/dom/tests/mochitest/notification/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = e10s || buildapp == 'mulet'
+skip-if = buildapp == 'mulet'
 support-files =
  MockServices.js
  NotificationTest.js
--- a/dom/tests/mochitest/orientation/mochitest.ini
+++ b/dom/tests/mochitest/orientation/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files = bug507902-frame.html

 [test_bug507902.html]
--- a/dom/tests/mochitest/storageevent/mochitest.ini
+++ b/dom/tests/mochitest/storageevent/mochitest.ini
@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
  frameLocalStorageMaster.html
  frameLocalStorageSlaveEqual.html
--- a/netwerk/test/mochitests/mochitest.ini
+++ b/netwerk/test/mochitests/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s || toolkit == 'android' # Android: Bug 1111137 & 1078267
+skip-if = buildapp == 'b2g' || toolkit == 'android' # Android: Bug 1111137 & 1078267

 support-files =
  method.sjs
@ -11,8 +11,12 @@ support-files =
 [test_arraybufferinputstream.html]
 [test_partially_cached_content.html]
 [test_rel_preconnect.html]
+skip-if = e10s
 [test_uri_scheme.html]
 [test_user_agent_overrides.html]
+skip-if = e10s
 [test_user_agent_updates.html]
+skip-if = e10s
 [test_user_agent_updates_reset.html]
 [test_xhr_method_case.html]
+skip-if = e10s
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
+skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 support-files =
  alloworigin.sjs
  backward.html
@ -27,6 +27,7 @@ support-files =

 [test_bug329869.html]
 [test_bug383369.html]
+skip-if = e10s
 [test_bug455367.html]
 [test_bug472986.html]
 [test_bug477118.html]
@ -60,3 +61,4 @@ support-files =
 [test_unsecurePictureDup.html]
 [test_unsecurePictureInIframe.html]
 [test_unsecureRedirect.html]
+skip-if = e10s
--- a/toolkit/components/alerts/test/mochitest.ini
+++ b/toolkit/components/alerts/test/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g'

 # Synchronous tests like test_alerts.html must come before
 # asynchronous tests like test_alerts_noobserve.html!
--- a/toolkit/components/places/tests/browser/mochitest.ini
+++ b/toolkit/components/places/tests/browser/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g'
 support-files =
  399606-httprefresh.html
  399606-location.reload.html
--- a/toolkit/components/places/tests/chrome/mochitest.ini
+++ b/toolkit/components/places/tests/chrome/mochitest.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g'
 support-files =
  sample_feed.atom
  bad_links.atom
--- a/toolkit/components/places/tests/mochitest.ini
+++ b/toolkit/components/places/tests/mochitest.ini
@ -1,3 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || e10s
+skip-if = buildapp == 'b2g'
 support-files = bug94514-postpage.html
--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@ -1,14 +1,14 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || e10s
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files = utils.js

 [test_assign_event_data.html]
-skip-if = toolkit == "cocoa" # Bug 933303
+skip-if = toolkit == "cocoa" || e10s # Mac: Bug 933303
 [test_bug565392.html]
 skip-if = toolkit != "windows"
 [test_picker_no_crash.html]
 skip-if = toolkit != "windows"
 support-files = window_picker_no_crash_child.html
 [test_plugin_scroll_invalidation.html]
-skip-if = toolkit != "gtk2"
+skip-if = toolkit != "gtk2" || e10s
 support-files = plugin_scroll_invalidation.html