Bug 1232780 - Disable mochitests which fail on e10s so we can get that suite running, a=test-only
authorJonathan Griffin <jgriffin@mozilla.com>
Tue, 05 Jan 2016 12:02:47 -0800
changeset 278540 e51048013b92f703aa035420b43a20a78a712fd7
parent 278539 b7cd1bc458a3c1c6e64f3f39edf7f757d61e2288
child 278541 10c8b5b877b9e7bf11c6a472338496a7aa0d3a10
push id69813
push userjgriffin@mozilla.com
push dateTue, 05 Jan 2016 20:24:51 +0000
treeherdermozilla-inbound@e51048013b92 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1232780
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1232780 - Disable mochitests which fail on e10s so we can get that suite running, a=test-only
docshell/test/navigation/mochitest.ini
dom/cache/test/mochitest/mochitest.ini
dom/canvas/test/mochitest.ini
dom/events/test/mochitest.ini
dom/html/test/mochitest.ini
dom/media/test/mochitest.ini
dom/plugins/test/mochitest/mochitest.ini
dom/plugins/test/mochitest/test_bug1092842.html
dom/plugins/test/mochitest/test_defaultValue.html
dom/plugins/test/mochitest/test_enumerate.html
dom/plugins/test/mochitest/test_instance_re-parent.html
dom/plugins/test/mochitest/test_propertyAndMethod.html
dom/plugins/test/mochitest/test_windowed_invalidate.html
dom/tests/mochitest/fetch/mochitest.ini
dom/workers/test/serviceworkers/mochitest.ini
layout/generic/test/test_plugin_focus.html
toolkit/components/alerts/test/mochitest.ini
widget/tests/mochitest.ini
--- a/docshell/test/navigation/mochitest.ini
+++ b/docshell/test/navigation/mochitest.ini
@@ -42,14 +42,14 @@ skip-if = (buildapp == 'b2g' && (toolkit
 [test_grandchild.html]
 [test_not-opener.html]
 skip-if = buildapp == 'b2g' || (toolkit == 'android' && processor == 'x86') #x86 only
 [test_opener.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_popup-navigates-children.html]
 skip-if = buildapp == 'b2g' # b2g(Needs multiple window.open support, also uses docshelltreenode) b2g-debug(Needs multiple window.open support, also uses docshelltreenode) b2g-desktop(Needs multiple window.open support, also uses docshelltreenode)
 [test_reserved.html]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || android_version == '10' || android_version == '18' #too slow on Android 2.3 and 4.3 aws only; bug 1030403
+skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || android_version == '10' || android_version == '18' || (e10s && debug && os == 'win') #too slow on Android 2.3 and 4.3 aws only; bug 1030403
 [test_sessionhistory.html]
 skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' #RANDOM # b2g-debug(Perma-orange on debug emulator builds) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
 [test_sibling-matching-parent.html]
 [test_sibling-off-domain.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
--- a/dom/cache/test/mochitest/mochitest.ini
+++ b/dom/cache/test/mochitest/mochitest.ini
@@ -27,16 +27,17 @@ support-files =
 
 [test_cache.html]
 [test_cache_add.html]
 [test_cache_match_request.html]
 [test_cache_matchAll_request.html]
 [test_cache_overwrite.html]
 [test_cache_match_vary.html]
 [test_caches.html]
+skip-if = e10s && debug && os == 'win'
 [test_cache_keys.html]
 [test_cache_put.html]
 [test_cache_requestCache.html]
 [test_cache_delete.html]
 [test_cache_put_reorder.html]
 [test_cache_https.html]
   skip-if = buildapp == 'b2g' # bug 1162353
 [test_cache_restart.html]
--- a/dom/canvas/test/mochitest.ini
+++ b/dom/canvas/test/mochitest.ini
@@ -254,30 +254,38 @@ skip-if = (buildapp == 'b2g' && toolkit 
 [test_imagebitmap_structuredclone_iframe.html]
 [test_imagebitmap_structuredclone_window.html]
 [test_imagebitmap_transfer.html]
 [test_ImageData_ctor.html]
 [test_isPointInStroke.html]
 [test_mozDashOffset.html]
 [test_mozGetAsFile.html]
 [test_strokeText_throw.html]
+skip-if = (e10s && debug && os == 'win')
 [test_toBlob.html]
+skip-if = (e10s && debug && os == 'win') # bug 1236257
 [test_toDataURL_alpha.html]
+skip-if = (e10s && debug && os == 'win')
 [test_toDataURL_lowercase_ascii.html]
+skip-if = (e10s && debug && os == 'win')
 [test_toDataURL_parameters.html]
+skip-if = (e10s && debug && os == 'win')
 [test_windingRuleUndefined.html]
+skip-if = (e10s && debug && os == 'win')
 [test_2d.fillText.gradient.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # bug 1040965
 [test_2d_composite_canvaspattern_setTransform.html]
 [test_createPattern_broken.html]
 [test_setlinedash.html]
+skip-if = (e10s && debug && os == 'win')
 [test_filter.html]
 [test_offscreencanvas_toblob.html]
 tags = offscreencanvas
 [test_offscreencanvas_toimagebitmap.html]
+skip-if = (e10s && debug && os == 'win')
 tags = offscreencanvas
 [test_offscreencanvas_basic_webgl.html]
 tags = offscreencanvas
 [test_offscreencanvas_dynamic_fallback.html]
 tags = offscreencanvas
 [test_offscreencanvas_sharedworker.html]
 tags = offscreencanvas
 [test_offscreencanvas_serviceworker.html]
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@@ -82,17 +82,17 @@ skip-if = true # Disabled due to timeout
 skip-if = buildapp == 'b2g' || toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug591815.html]
 [test_bug593959.html]
 [test_bug603008.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove) b2g-debug(1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove) b2g-desktop(1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove)
 [test_bug605242.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug607464.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #CRASH_DUMP, RANDOM
+skip-if = buildapp == 'b2g' || toolkit == 'android' || (e10s && os == 'win') #CRASH_DUMP, RANDOM
 [test_bug613634.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug615597.html]
 skip-if = buildapp == 'b2g' # b2g(bug 900969, 5 tests) b2g-debug(bug 900969, 5 tests) b2g-desktop(bug 900969, 5 tests)
 [test_bug624127.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug635465.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@@ -588,17 +588,17 @@ skip-if = buildapp == 'b2g' || e10s
 [test_bug765780.html]
 [test_bug871161.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 support-files = file_bug871161-1.html file_bug871161-2.html
 [test_bug1013316.html]
 [test_hash_encoded.html]
 [test_bug1081037.html]
 [test_window_open_close.html]
-skip-if = buildapp == 'b2g' # bug 1129014
+skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # bug 1129014
 [test_img_complete.html]
 [test_viewport_resize.html]
 [test_extapp.html]
 [test_image_clone_load.html]
 [test_bug1203668.html]
 [test_bug1166138.html]
 [test_filepicker_default_directory.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -841,16 +841,18 @@ skip-if = toolkit == 'gonk' || (toolkit 
 [test_video_to_canvas.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_video_in_audio_element.html]
 [test_videoDocumentTitle.html]
 [test_VideoPlaybackQuality.html]
 [test_VideoPlaybackQuality_disabled.html]
 [test_volume.html]
 [test_vttparser.html]
+skip-if = e10s && debug && os == 'win'
 [test_webvtt_disabled.html]
+skip-if = e10s && debug && os == 'win'
 
 # The tests below contain backend-specific tests. Write backend independent
 # tests rather than adding to this list.
 [test_can_play_type_webm.html]
 [test_can_play_type_wave.html]
 [test_fragment_noplay.html]
 [test_fragment_play.html]
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@@ -112,15 +112,15 @@ skip-if = toolkit != "cocoa"
 [test_src_url_change.html]
 [test_streamNotify.html]
 [test_stringHandling.html]
 [test_streamatclose.html]
 [test_twostreams.html]
 [test_windowed_invalidate.html]
 skip-if = os != "win"
 [test_windowless_ime.html]
-skip-if = os != "win"
+skip-if = os != "win" || e10s
 [test_visibility.html]
 skip-if = toolkit == "cocoa"
 [test_zero_opacity.html]
 skip-if = e10s
 [test_bug1165981.html]
 skip-if = !(os == "win" && processor == "x86_64")
--- a/dom/plugins/test/mochitest/test_bug1092842.html
+++ b/dom/plugins/test/mochitest/test_bug1092842.html
@@ -4,16 +4,17 @@
   <title>Bug 1092842</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="plugin-utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <body onload="startTest()">
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  SimpleTest.expectAssertions(0, 1);
   setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var p = null;
 
   function startTest() {
     p = document.getElementById('theplugin');
     if (!p.hasWidget()) {
       todo(false, "This test is only relevant for windowed plugins");
--- a/dom/plugins/test/mochitest/test_defaultValue.html
+++ b/dom/plugins/test/mochitest/test_defaultValue.html
@@ -6,16 +6,17 @@
     <script type="text/javascript" src="plugin-utils.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   </head>
 
   <body onload="run()">
 
     <script class="testbody" type="application/javascript">
       SimpleTest.waitForExplicitFinish();
+      SimpleTest.expectAssertions(0, 1);
       setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
       function run() {
         var plugin = document.getElementById("plugin");
         var pluginProto = Object.getPrototypeOf(plugin);
 
         plugin.propertyAndMethod = {};
         plugin.propertyAndMethod + "baz";
--- a/dom/plugins/test/mochitest/test_enumerate.html
+++ b/dom/plugins/test/mochitest/test_enumerate.html
@@ -6,16 +6,17 @@
 
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 
 <body onload="runTests()">
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    SimpleTest.expectAssertions(0, 1);
     setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     function runTests() {
       var pluginElement = document.getElementById("plugin1");
       var c = 0;
       var foundSetColor = false;
       for (var n in pluginElement) {
         ++c;
--- a/dom/plugins/test/mochitest/test_instance_re-parent.html
+++ b/dom/plugins/test/mochitest/test_instance_re-parent.html
@@ -5,16 +5,17 @@
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="plugin-utils.js"></script>
 </head>
 <body onload="begin()">
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  SimpleTest.expectAssertions(0, 3);
   setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   const MAX_CHECK_PLUGIN_STOPPED_ATTEMPTS = 50;
   var numCheckPluginStoppedAttempts = 0;
   var exceptionThrown = false;
   var p = null;
   var d1 = null;
   var d2 = null;
--- a/dom/plugins/test/mochitest/test_propertyAndMethod.html
+++ b/dom/plugins/test/mochitest/test_propertyAndMethod.html
@@ -19,16 +19,17 @@
           Object.getPrototypeOf = function(object) {
             // May break if the constructor has been tampered with
             return object.constructor.prototype;
           };
         }
       }
 
       SimpleTest.waitForExplicitFinish();
+      SimpleTest.expectAssertions(0, 1);
       setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
       function run() {
         var plugin = document.getElementById("plugin");
         var pluginProto = Object.getPrototypeOf(plugin);
 
         delete pluginProto.propertyAndMethod;
         ok(isNaN(plugin.propertyAndMethod + 0), "Shouldn't be set yet!");
--- a/dom/plugins/test/mochitest/test_windowed_invalidate.html
+++ b/dom/plugins/test/mochitest/test_windowed_invalidate.html
@@ -5,16 +5,17 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="plugin-utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  SimpleTest.expectAssertions(0, 1);
   SimpleTest.requestFlakyTimeout("untriaged");
   setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var lastPaintCount;
   var p = null;
 
   function checkPainted() {
     if (p.getPaintCount() > lastPaintCount) {
--- a/dom/tests/mochitest/fetch/mochitest.ini
+++ b/dom/tests/mochitest/fetch/mochitest.ini
@@ -16,30 +16,39 @@ support-files =
   reroute.js
   reroute.js^headers^
   sw_reroute.js
 
 [test_headers.html]
 [test_headers_sw_reroute.html]
 skip-if = buildapp == 'b2g' # Bug 1137683
 [test_headers_mainthread.html]
+skip-if = (e10s && debug && os == 'win')
 [test_fetch_app_protocol.html]
+skip-if = (e10s && debug && os == 'win')
 [test_fetch_basic.html]
+skip-if = (e10s && debug && os == 'win')
 [test_fetch_basic_sw_reroute.html]
-skip-if = buildapp == 'b2g' # Bug 1137683
+skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # Bug 1137683
 [test_fetch_basic_http.html]
+skip-if = (e10s && debug && os == 'win')
 [test_fetch_basic_http_sw_reroute.html]
-skip-if = buildapp == 'b2g' # Bug 1137683
+skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # Bug 1137683
 [test_fetch_cors.html]
-skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) # Bug 1210552 && 1210282
+skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) || (e10s && debug && os == 'win') # Bug 1210552 && 1210282
 [test_fetch_cors_sw_reroute.html]
-skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) # Bug 1137683 && 1210282
+skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) || (e10s && debug && os == 'win') # Bug 1137683 && 1210282
 [test_formdataparsing.html]
+skip-if = (e10s && debug && os == 'win')
 [test_formdataparsing_sw_reroute.html]
-skip-if = buildapp == 'b2g' # Bug 1137683
+skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # Bug 1137683
 [test_request.html]
+skip-if = (e10s && debug && os == 'win')
 [test_request_cache.html]
+skip-if = (e10s && debug && os == 'win')
 [test_request_context.html]
+skip-if = (e10s && debug && os == 'win')
 [test_request_sw_reroute.html]
-skip-if = buildapp == 'b2g' # Bug 1137683
+skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # Bug 1137683
 [test_response.html]
+skip-if = (e10s && debug && os == 'win')
 [test_response_sw_reroute.html]
-skip-if = buildapp == 'b2g' # Bug 1137683
+skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # Bug 1137683
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g'
+
 support-files =
   worker.js
   worker2.js
   worker3.js
   fetch_event_worker.js
   parse_error_worker.js
   activate_event_error_worker.js
   install_event_worker.js
@@ -192,105 +193,172 @@ support-files =
   xslt/*
   unresolved_fetch_worker.js
   header_checker.sjs
   openWindow_worker.js
   redirect.sjs
   open_window/client.html
 
 [test_app_protocol.html]
-skip-if = release_build
+skip-if = release_build || (e10s && debug && os == 'win')
 [test_bug1151916.html]
+skip-if = e10s && debug && os == 'win'
 [test_claim.html]
+skip-if = e10s && debug && os == 'win'
 [test_claim_fetch.html]
+skip-if = e10s && debug && os == 'win'
 [test_claim_oninstall.html]
+skip-if = e10s && debug && os == 'win'
 [test_close.html]
+skip-if = e10s && debug && os == 'win'
 [test_controller.html]
+skip-if = e10s && debug && os == 'win'
 [test_cross_origin_url_after_redirect.html]
+skip-if = e10s && debug && os == 'win'
 [test_empty_serviceworker.html]
+skip-if = e10s && debug && os == 'win'
 [test_eval_allowed.html]
+skip-if = e10s && debug && os == 'win'
 [test_fetch_event.html]
+skip-if = e10s && debug && os == 'win'
 [test_force_refresh.html]
+skip-if = e10s && debug && os == 'win'
 [test_gzip_redirect.html]
+skip-if = e10s && debug && os == 'win'
 [test_https_fetch.html]
+skip-if = e10s && debug && os == 'win'
 [test_https_fetch_cloned_response.html]
+skip-if = e10s && debug && os == 'win'
 [test_https_origin_after_redirect.html]
+skip-if = e10s && debug && os == 'win'
 [test_https_origin_after_redirect_cached.html]
+skip-if = e10s && debug && os == 'win'
 [test_https_synth_fetch_from_cached_sw.html]
+skip-if = e10s && debug && os == 'win'
 [test_importscript.html]
+skip-if = e10s && debug && os == 'win'
 [test_install_event.html]
+skip-if = e10s && debug && os == 'win'
 [test_installation_simple.html]
+skip-if = e10s && debug && os == 'win'
 [test_interception_featuredetect.html]
+skip-if = e10s && debug && os == 'win'
 [test_match_all.html]
+skip-if = e10s && debug && os == 'win'
 [test_match_all_advanced.html]
+skip-if = e10s && debug && os == 'win'
 [test_match_all_client_id.html]
+skip-if = e10s && debug && os == 'win'
 [test_match_all_client_properties.html]
+skip-if = e10s && debug && os == 'win'
 [test_navigator.html]
+skip-if = e10s && debug && os == 'win'
 [test_origin_after_redirect.html]
+skip-if = e10s && debug && os == 'win'
 [test_origin_after_redirect_cached.html]
+skip-if = e10s && debug && os == 'win'
 [test_origin_after_redirect_to_https.html]
+skip-if = e10s && debug && os == 'win'
 [test_origin_after_redirect_to_https_cached.html]
+skip-if = e10s && debug && os == 'win'
 [test_post_message.html]
+skip-if = e10s && debug && os == 'win'
 [test_post_message_advanced.html]
+skip-if = e10s && debug && os == 'win'
 [test_post_message_source.html]
+skip-if = e10s && debug && os == 'win'
 [test_register_base.html]
+skip-if = e10s && debug && os == 'win'
 [test_register_https_in_http.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_audio.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_beacon.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_cache.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_cspreport.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_embed.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_fetch.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_font.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_frame.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_iframe.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_image.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_imagesrcset.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_internal.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_nestedworker.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_nestedworkerinsharedworker.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_object.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_picture.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_ping.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_plugin.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_script.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_sharedworker.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_style.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_track.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_video.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_worker.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_xhr.html]
+skip-if = e10s && debug && os == 'win'
 [test_request_context_xslt.html]
+skip-if = e10s && debug && os == 'win'
 [test_scopes.html]
+skip-if = e10s && debug && os == 'win'
 [test_sandbox_intercept.html]
+skip-if = e10s && debug && os == 'win'
 [test_notificationclick.html]
+skip-if = e10s && debug && os == 'win'
 [test_notificationclick_focus.html]
-skip-if = toolkit == "android" || toolkit == "gonk"
+skip-if = toolkit == "android" || toolkit == "gonk" || (e10s && debug && os == 'win')
 [test_notification_constructor_error.html]
+skip-if = e10s && debug && os == 'win'
 [test_notification_get.html]
+skip-if = e10s && debug && os == 'win'
 [test_sanitize.html]
 [test_sanitize_domain.html]
 [test_service_worker_allowed.html]
 [test_serviceworker_interfaces.html]
 [test_serviceworker_not_sharedworker.html]
 [test_skip_waiting.html]
 [test_strict_mode_warning.html]
 [test_third_party_iframes.html]
 [test_unregister.html]
 [test_workerUnregister.html]
 [test_workerUpdate.html]
 [test_workerupdatefoundevent.html]
 [test_opaque_intercept.html]
 [test_xslt.html]
+skip-if = e10s && debug && os == 'win'
 [test_escapedSlashes.html]
 [test_eventsource_intercept.html]
 [test_not_intercept_plugin.html]
 [test_file_blob_upload.html]
 [test_unresolved_fetch_interception.html]
 [test_hsts_upgrade_intercept.html]
 [test_csp_upgrade-insecure_intercept.html]
 [test_serviceworker_header.html]
 [test_openWindow.html]
-skip-if = toolkit == "android" || toolkit == "gonk"
+skip-if = toolkit == "android" || toolkit == "gonk" || (e10s && debug && os == 'win')
 [test_imagecache.html]
 [test_imagecache_max_age.html]
 [test_importscript_mixedcontent.html]
 tags = mcb
--- a/layout/generic/test/test_plugin_focus.html
+++ b/layout/generic/test/test_plugin_focus.html
@@ -16,13 +16,14 @@ function childDone() {
   child.close();
   // This test has a history of focus issues, but waiting for focus to return
   // from the child window instead of attempting to reclaim it after finish
   // seems to prevent some kind of race on win8 (Bug 874843)
   SimpleTest.waitForFocus(SimpleTest.finish, window);
 }
 
 SimpleTest.waitForExplicitFinish();
+SimpleTest.expectAssertions(0, 1);
 child = window.open("plugin_focus_helper.html", "", "width=620,height=320");
 </script>
 
 </body>
 </html>
--- a/toolkit/components/alerts/test/mochitest.ini
+++ b/toolkit/components/alerts/test/mochitest.ini
@@ -4,9 +4,9 @@ skip-if = buildapp == 'b2g' || buildapp 
 # Synchronous tests like test_alerts.html must come before
 # asynchronous tests like test_alerts_noobserve.html!
 [test_alerts.html]
 skip-if = toolkit == 'android'
 [test_alerts_noobserve.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_multiple_alerts.html]
 [test_principal.html]
-skip-if = toolkit == 'android'
+skip-if = toolkit == 'android' || (e10s && os == 'win')
--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files = utils.js
 
 [test_assign_event_data.html]
 skip-if = toolkit == "cocoa" || e10s # Mac: Bug 933303
 [test_bug565392.html]
-skip-if = toolkit != "windows"
+skip-if = toolkit != "windows" || (e10s && os == 'win')
 [test_picker_no_crash.html]
-skip-if = toolkit != "windows"
+skip-if = toolkit != "windows" || (e10s && os == 'win')
 support-files = window_picker_no_crash_child.html
 [test_plugin_scroll_invalidation.html]
 skip-if = toolkit != "gtk2" || e10s
 support-files = plugin_scroll_invalidation.html