Backed out changeset 1a0f002865d3 (bug 1650919) for test_deprecated.html failures CLOSED TREE

2024-10-08 10:44:56 +00:00 · 2020-07-13 19:22:21 +03:00 · 2020-07-13 19:22:21 +03:00 · 6faddf7d8f
commit 6faddf7d8f
parent 00004145e8
47 changed files with 103 additions and 169 deletions
--- a/caps/tests/mochitest/mochitest.ini
+++ b/caps/tests/mochitest/mochitest.ini
@ -13,5 +13,4 @@ skip-if = os == 'android'
 [test_bug423375.html]
 [test_bug470804.html]
 [test_bug1367586.html]
-fail-if = (xorigin && fission)  # Session history, JavaScript error: http://mochi.test:8888/tests/caps/tests/mochitest/test_bug1367586.html?currentTestURL=caps%2Ftests%2Fmochitest%2Ftest_bug1367586.html&closeWhenDone=1&showTestReport=false&expected=pass, line 35: NS_ERROR_FAILURE:
 [test_disallowInheritPrincipal.html]
--- a/docshell/test/iframesandbox/mochitest.ini
+++ b/docshell/test/iframesandbox/mochitest.ini
@ -21,4 +21,5 @@ tags = openwindow
 [test_sibling_navigation_by_location.html]
 tags = openwindow
 [test_top_navigation_by_location_exotic.html]
+skip-if = xorigin # Assertion failure: parent, at /builds/worker/checkouts/gecko/docshell/base/BrowsingContext.cpp:1624
 [test_top_navigation_by_location.html]
--- a/docshell/test/mochitest/mochitest.ini
+++ b/docshell/test/mochitest/mochitest.ini
@ -63,7 +63,6 @@ support-files =
  !/docshell/test/navigation/blank.html
 fail-if = xorigin
 [test_bug385434.html]
-skip-if = (xorigin && fission) # Hangs, JavaScript error: http://mochi.test:8888/tests/docshell/test/mochitest/test_bug385434.html?currentTestURL=docshell%2Ftest%2Fmochitest%2Ftest_bug385434.html&closeWhenDone=undefined&showTestReport=true&expected=pass, line 132: NS_ERROR_FAILURE:
 [test_bug387979.html]
 [test_bug402210.html]
 [test_bug404548.html]
@ -82,7 +81,6 @@ support-files = bug530396-noref.sjs bug530396-subframe.html
 [test_bug540462.html]
 skip-if = toolkit == 'android' && debug && !is_fennec
 [test_bug551225.html]
-fail-if = (xorigin && fission) # Session History
 [test_bug570341.html]
 skip-if = (verify && !debug && (os == 'win'))
 [test_bug580069.html]
--- a/docshell/test/navigation/test_triggeringprincipal_frame_same_origin_nav.html
+++ b/docshell/test/navigation/test_triggeringprincipal_frame_same_origin_nav.html
@ -38,9 +38,9 @@ const TRIGGERING_PRINCIPAL_URI =
 const LOADING_PRINCIPAL_URI = TRIGGERING_PRINCIPAL_URI;

 function receiveMessage(event) {
-  is(event.data.triggeringPrincipalURI.split("?")[0], TRIGGERING_PRINCIPAL_URI,
+  is(event.data.triggeringPrincipalURI, TRIGGERING_PRINCIPAL_URI,
     "TriggeringPrincipal should be the parent iframe");
-  is(event.data.loadingPrincipalURI.split("?")[0], TRIGGERING_PRINCIPAL_URI,
+  is(event.data.loadingPrincipalURI, TRIGGERING_PRINCIPAL_URI,
     "LoadingPrincipal should be the parent iframe");

  window.removeEventListener("message", receiveMessage);
--- a/dom/animation/test/mochitest.ini
+++ b/dom/animation/test/mochitest.ini
@ -64,7 +64,6 @@ skip-if = (os == "win" && processor == "aarch64") #bug 1535784
 [style/test_animation-seeking-with-start-time.html]
 [style/test_animation-setting-effect.html]
 [style/test_composite.html]
-skip-if = xorigin 
 [style/test_interpolation-from-interpolatematrix-to-none.html]
 [style/test_missing-keyframe.html]
 [style/test_missing-keyframe-on-compositor.html]
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@ -332,7 +332,6 @@ skip-if = headless # Headless: Bug 1405868
 [test_bug339494.xhtml]
 [test_bug343596.html]
 [test_bug345339.html]
-fail-if = (xorigin && fission) # JavaScript error: http://mochi.test:8888/tests/dom/base/test/test_bug345339.html?currentTestURL=dom%2Fbase%2Ftest%2Ftest_bug345339.html&closeWhenDone=1&showTestReport=false&expected=pass, line 72: TypeError: can't access property "name", newFile is undefined; Xorigin only passes.
 [test_bug346485.html]
 [test_bug352728.html]
 [test_bug352728.xhtml]
@ -360,8 +359,8 @@ support-files = file_bug357450.js
 [test_bug372964.html]
 [test_bug373181.xhtml]
 [test_bug375314.html]
+skip-if = xorigin # Hangs
 [test_bug375314-2.html]
-skip-if = xorigin # Hangs, [Exception... "Component returned failure code: 0xc1f30100 (NS_ERROR_FACTORY_EXISTS) [nsIComponentRegistrar.registerFactory]"  nsresult: "0xc1f30100 (NS_ERROR_FACTORY_EXISTS)"  location: "JS frame :: createChromeScript :: createChromeScript :: line 40"  data: no]
 [test_bug378969.html]
 [test_bug380418.html]
 support-files = test_bug380418.html^headers^
@ -376,7 +375,6 @@ support-files = test_bug380418.html^headers^
 [test_bug395915.html]
 [test_bug397234.html]
 [test_bug398243.html]
-fail-if = (xorigin && fission)
 [test_bug401662.html]
 [test_bug402150.html]
 support-files = test_bug402150.html^headers^
@ -506,7 +504,6 @@ skip-if = (verify && !debug && (os == 'linux')) #bug 687032
 [test_bug606729.html]
 [test_bug614058.html]
 [test_bug622088.html]
-skip-if = (xorigin && fission) # Session History, JavaScript error: http://mochi.test:8888/tests/dom/base/test/test_bug622088.html?currentTestURL=dom%2Fbase%2Ftest%2Ftest_bug622088.html&closeWhenDone=undefined&showTestReport=true&expected=pass, line 37: NS_ERROR_FAILURE:
 [test_bug622117.html]
 [test_bug622246.html]
 [test_bug625722.html]
@ -586,7 +583,7 @@ skip-if = (xorigin && fission) # Session History, JavaScript error: http://mochi
 [test_bug913761.html]
 [test_bug922681.html]
 [test_bug927196.html]
-fail-if = (xorigin && fission)
+fail-if = xorigin
 [test_bug962251.html]
 [test_bug976673.html]
 skip-if = fission #Bug 1613899
@ -603,6 +600,7 @@ support-files = test_bug1037687_subframe.html
 [test_bug1070015.html]
 [test_bug1075702.html]
 [test_bug1091883.html]
+fail-if = xorigin
 [test_bug1100912.html]
 support-files = file_bug1100912.html
 [test_bug1101364.html]
@ -692,11 +690,9 @@ skip-if = (toolkit == 'android') # Android: Bug 1465387
 [test_getTranslationNodes.html]
 [test_getTranslationNodes_limit.html]
 [test_gsp-qualified.html]
-skip-if = (xorigin && fission) # Assertion failure: mInFlightProcessId == 0, at /builds/worker/checkouts/gecko/docshell/base/CanonicalBrowsingContext.cpp:137, JavaScript error: /builds/worker/workspace/build/tests/bin/components/httpd.js, line 3824: NS_ERROR_NOT_AVAILABLE:
 [test_gsp-quirks.html]
 [test_gsp-standards.html]
 [test_history_document_open.html]
-fail-if = (xorigin && fission) # NS_ERROR_FAILURE:  at f@http://mochi.test:8888/tests/dom/base/test/file_history_document_open.html:1:16
 [test_history_state_null.html]
 [test_html_colors_quirks.html]
 [test_html_colors_standards.html]
@ -785,7 +781,7 @@ tags = audiochannel
 [test_noAudioNotificationOnVolume0Element.html]
 tags = audiochannel
 [test_NodeIterator_basics_filters.xhtml]
-skip-if = xorigin # JavaScript error: http://mochi.test:8888/tests/SimpleTest/SimpleTest.js, line 76: DataCloneError: The object could not be cloned.
+skip-if = xorigin
 [test_NodeIterator_mutations_1.xhtml]
 [test_NodeIterator_mutations_2.html]
 [test_NodeIterator_mutations_3.html]
@ -803,11 +799,11 @@ reason = Plugins are not supported on Windows/AArch64
 [test_pluginAudioNotification.html]
 tags = audiochannel
 skip-if = toolkit == 'android' # Plugins don't work on Android
-  || (xorigin && fission) # JavaScript error: resource://specialpowers/SpecialPowersChild.jsm, line 719: SecurityError: Permission denied to access property "windowGlobalChild" on cross-origin object
+  || xorigin # Hangs
 [test_pluginMutedBeforePlay.html]
 tags = audiochannel
 skip-if = toolkit == 'android' # Plugins don't work on Android
-  || (xorigin && fission) #  JavaScript error: , line 0: uncaught exception: Object
+  || xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object, JavaScript error: /builds/worker/workspace/build/tests/bin/components/httpd.js, line 3824: NS_ERROR_NOT_AVAILABLE:
 [test_postMessage_solidus.html]
 [test_postMessages_window.html]
 [test_postMessages_workers.html]
--- a/dom/base/test/test_bug1091883.html
+++ b/dom/base/test/test_bug1091883.html
@ -71,7 +71,7 @@ window.addEventListener("message", function(event) {
  var testRun = +out[1];
  results[makeResultsKey(testRun)] = referrer;
  if (event.origin == "http://mochi.test:8888") {
-    is(referrer.split("?")[0],
+    is(referrer,
       "http://mochi.test:8888/tests/dom/base/test/test_bug1091883.html",
       "must be full referrer");
  } else {
--- a/dom/crypto/test/mochitest.ini
+++ b/dom/crypto/test/mochitest.ini
@ -10,7 +10,6 @@ support-files =

 [test_indexedDB.html]
 skip-if = !fission # Requires iframes to run in separate processes.
-fail-if = xorigin # JavaScript error: https://example.org/tests/dom/crypto/test/test_indexedDB.html?currentTestURL=dom%2Fcrypto%2Ftest%2Ftest_indexedDB.html&closeWhenDone=undefined&showTestReport=true&expected=pass, line 27: SecurityError: Permission denied to access property "frameElement" on cross-origin object
 [test_WebCrypto.html]
 [test_WebCrypto_DH.html]
 [test_WebCrypto_ECDH.html]
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@ -28,7 +28,7 @@ support-files =
 [test_bug1539497.html]
 [test_bug226361.xhtml]
 [test_bug238987.html]
-fail-if = (xorigin && fission)
+fail-if = xorigin
 [test_bug288392.html]
 [test_bug299673-1.html]
 [test_bug1037990.html]
@ -57,7 +57,7 @@ skip-if = verify
 [test_bug448602.html]
 [test_bug450876.html]
 skip-if = verify
-fail-if = (xorigin && fission)
+fail-if = xorigin
 [test_bug456273.html]
 [test_bug457672.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
@ -122,7 +122,6 @@ skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug704423.html]
 [test_bug741666.html]
-skip-if = (xorigin && fission) # Inconsistent pass/fail in treeherder
 [test_coalesce_touchmove.html]
 support-files = file_coalesce_touchmove.html
 skip-if = debug #In order to be able to test touchmoves, the test needs to synthesize touchstart in a way which asserts
--- a/dom/events/test/pointerevents/mochitest.ini
+++ b/dom/events/test/pointerevents/mochitest.ini
@ -81,7 +81,7 @@ support-files = pointerevent_sequence_at_implicit_release_on_drag-manual.html
 [test_pointerevent_setpointercapture_inactive_button_mouse-manual.html]
 support-files = pointerevent_setpointercapture_inactive_button_mouse-manual.html
 skip-if = verify && (os == 'linux' || os == 'mac')
-  || (xorigin && fission) # Unexpected-pass and unexpected-fail in treeherder; JavaScript error: http://mochi.test:8888/tests/dom/events/test/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html, line 35: InvalidPointerId: Invalid pointer id.
+  || xorigin # JavaScript error: http://mochi.test:8888/tests/dom/events/test/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html, line 35: InvalidPointerId: Invalid pointer id.
 [test_pointerevent_setpointercapture_invalid_pointerid-manual.html]
 support-files = pointerevent_setpointercapture_invalid_pointerid-manual.html
 [test_pointerevent_setpointercapture_override_pending_capture_element-manual.html]
@ -94,6 +94,7 @@ support-files = pointerevent_suppress_compat_events_on_click-manual.html
 support-files = pointerevent_suppress_compat_events_on_drag_mouse-manual.html
 [test_touch_action.html]
 skip-if = os == 'android' # Bug 1312791
+  || xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 support-files =
  ../../../../gfx/layers/apz/test/mochitest/apz_test_utils.js
  ../../../../gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
@ -122,7 +123,6 @@ support-files =
 support-files =
  file_test_trigger_fullscreen.html
 [test_trigger_popup_by_pointer_events.html]
-fail-if = (xorigin && !fission)
 [test_remove_frame_when_got_pointer_capture.html]
 [test_getCoalescedEvents.html]
 skip-if = !e10s || os == 'android' # Bug 1312791
--- a/dom/html/test/forms/mochitest.ini
+++ b/dom/html/test/forms/mochitest.ini
@ -50,7 +50,6 @@ prefs =
 [test_input_hasBeenTypePassword.html]
 [test_input_hasBeenTypePassword_navigation.html]
 support-files = file_login_fields.html
-skip-if = (xorigin && fission) # Session History, JavaScript error: javascript:history.back(), line 1: NS_ERROR_FAILURE:
 [test_input_list_attribute.html]
 [test_input_number_l10n.html]
 [test_input_number_key_events.html]
@ -98,9 +97,7 @@ skip-if = os == "android" || (os == "mac" && debug) # Bug 1484442
 [test_radio_radionodelist.html]
 [test_required_attribute.html]
 [test_restore_form_elements.html]
-fail-if = (xorigin && fission)
 [test_save_restore_radio_groups.html]
-fail-if = (xorigin && fission)
 [test_select_change_event.html]
 skip-if = os == 'mac'
 [test_select_input_change_event.html]
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@ -209,7 +209,6 @@ skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug24958.html]
 [test_bug274626.html]
 [test_bug277724.html]
-fail-if = (xorigin && fission) # Session history
 [test_bug277890.html]
 [test_bug287465.html]
 [test_bug295561.html]
@ -518,7 +517,7 @@ skip-if = (toolkit == 'android') || ((os == 'win' || os == 'linux') && debug) #
 [test_restore_from_parser_fragment.html]
 [test_rowscollection.html]
 [test_srcdoc-2.html]
-fail-if = (xorigin && fission) # NS_ERROR_FAILURE:  at pframe.onload/<@http://mochi.test:8888/tests/dom/html/test/test_srcdoc-2.html?currentTestURL=dom%2Fhtml%2Ftest%2Ftest_srcdoc-2.html&closeWhenDone=undefined&showTestReport=true&expected=pass:42:24
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_srcdoc.html]
 [test_style_attributes_reflection.html]
 [test_track.html]
--- a/dom/indexedDB/test/mochitest.ini
+++ b/dom/indexedDB/test/mochitest.ini
@ -228,13 +228,14 @@ skip-if = (xorigin && !debug) # Hangs
 [test_open_empty_db.html]
 [test_open_for_principal.html]
 [test_open_objectStore.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_optionalArguments.html]
 [test_overlapping_transactions.html]
 [test_persistenceType.html]
 [test_put_get_values.html]
 [test_put_get_values_autoIncrement.html]
 [test_readonly_transactions.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_readwriteflush_disabled.html]
 [test_remove_index.html]
 [test_rename_index.html]
--- a/dom/midi/tests/mochitest.ini
+++ b/dom/midi/tests/mochitest.ini
@ -2,6 +2,7 @@
 support-files =
  MIDITestUtils.js
 scheme = https
+skip-if = xorigin


 [test_midi_permission_prompt.html]
--- a/dom/notification/test/mochitest/mochitest.ini
+++ b/dom/notification/test/mochitest/mochitest.ini
@ -17,3 +17,4 @@ scheme = https
 [test_notification_storage.html]
 [test_bug931307.html]
 [test_notification_tag.html]
+skip-if = xorigin  # Application time out
--- a/dom/permission/tests/mochitest.ini
+++ b/dom/permission/tests/mochitest.ini
@ -8,6 +8,5 @@ prefs =

 [test_cross_origin_iframe.html]
 skip-if = fission #Bug 1580462
-fail-if = xorigin
 [test_permissions_api.html]
 skip-if = xorigin # Hangs
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@ -31,23 +31,25 @@ support-files =
  plugin-utils.js

 [test_bug1028200-1.html]
-skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
+skip-if = xorigin || !crashreporter
 [test_bug1028200-2.html]
 skip-if = !crashreporter
+  || xorigin # Hangs JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_bug1028200-3.html]
 skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
+  || xorigin # Hangs, ReferenceError: can't access lexical declaration `load' before initialization at onload@http://mochi.test:8888/tests/dom/plugins/test/mochitest/test_bug1028200-3.html:1:1`,  TypeError: parentRunner.expectChildProcessCrash is not a function at SimpleTest.expectChildProcessCrash@http://mochi.test:8888/tests/SimpleTest/SimpleTest.js:1754:18
 [test_bug1028200-4.html]
 skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
+  || xorigin # Hangs, TypeError: parentRunner.expectChildProcessCrash is not a function at SimpleTest.expectChildProcessCrash@http://mochi.test:8888/tests/SimpleTest/SimpleTest.js:1754:18
 [test_bug1028200-5.html]
 skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
+  || xorigin # Hangs, TypeError: parentRunner.expectChildProcessCrash is not a function at SimpleTest.expectChildProcessCrash@http://mochi.test:8888/tests/SimpleTest/SimpleTest.js:1754:18
 [test_bug1028200-6.html]
 skip-if = !crashreporter
+  || xorigin # Hangs, TypeError: parentRunner.expectChildProcessCrash is not a function at SimpleTest.expectChildProcessCrash@http://mochi.test:8888/tests/SimpleTest/SimpleTest.js:1754:18
 [test_bug1028200-7.html]
 skip-if = !crashreporter
+  || xorigin # Hangs, TypeError: parentRunner.expectChildProcessCrash is not a function at SimpleTest.expectChildProcessCrash@http://mochi.test:8888/tests/SimpleTest/SimpleTest.js:1754:18
 [test_bug532208.html]
 [test_bug539565-1.html]
 [test_bug539565-2.html]
@ -65,12 +67,10 @@ skip-if = !crashreporter
 skip-if = (verify && (os == 'win')) || (os == "win" && webrender) # win/webrender bug 1296400
 [test_bug1165981.html]
 skip-if = (processor == 'aarch64' && os == 'win')
-  || (xorigin && !fission) # JavaScript error: test_bug1165981.html:line 51: TypeError: pluginElement.identifierToStringTest is not a function; this test incorrectly passes when fission is enabled because the permission is being checked for the frame site rather than the top-level site.
 reason = Plugins are not supported on Windows/AArch64
 [test_bug1245545.html]
 [test_bug1307694.html]
 skip-if = verify || (processor == 'aarch64' && os == 'win') # aarch64 due to 1541241
-fail-if = (xorigin && !fission)
 [test_cocoa_focus.html]
 skip-if = toolkit != "cocoa" || e10s # Bug 1194534
 support-files = cocoa_focus.html
@ -83,6 +83,7 @@ skip-if = toolkit != "gtk"
 skip-if = toolkit != "gtk"
 [test_crashing.html]
 skip-if = !crashreporter
+  || xorigin # Hangs, TypeError: parentRunner.expectChildProcessCrash is not a function at SimpleTest.expectChildProcessCrash@http://mochi.test:8888/tests/SimpleTest/SimpleTest.js:1754:18
 [test_crashing2.html]
 skip-if = (!crashreporter) || true # Bug 566049
 [test_CrashService_crash.html]
@ -144,7 +145,7 @@ skip-if = (toolkit != "cocoa") || (os != "win")
 [test_refresh_navigator_plugins.html]
 skip-if = e10s # Bug 1090576
 [test_secondPlugin.html]
-fail-if = (xorigin && fission) # Should NOT be able to call a function on a click-to-play plugin
+fail-if = xorigin
 [test_src_url_change.html]
 [test_streamatclose.html]
 [test_streamNotify.html]
--- a/dom/push/test/mochitest.ini
+++ b/dom/push/test/mochitest.ini
@ -8,36 +8,26 @@ support-files =
  test_utils.js
  mockpushserviceparent.js
  error_worker.js
-
+fail-if = xorigin

 [test_has_permissions.html]
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_has_permissions.html:: hasPermission :: line 41"  data: no] - Should not throw any errors
 [test_permissions.html]
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_permissions.html:: getEndpoint :: line 62"  data: no] - Should not throw any errors
 [test_register.html]
 skip-if = os == "win" # Bug 1373346
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_register.html:: checkPermissionState :: line 61"  data: no] - Should not throw any errors
 [test_register_key.html]
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: https://example.org/tests/dom/push/test/test_register_key.html:: validKey :: line 110"  data: no] - Should not throw any errors
 scheme = https
 [test_multiple_register.html]
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_multiple_register.html:: getEndpointExpectNull/p< :: line 80"  data: no]
 [test_multiple_register_during_service_activation.html]
 skip-if = (os == "win") || (os == "linux") || (os == "mac") #Bug 1274773
 [test_unregister.html]
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_unregister.html:: setupPushNotification :: line 42"  data: no] - Should not throw any errors
 [test_multiple_register_different_scope.html]
-fail-if = (xorigin && fission)  [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_multiple_register_different_scope.html :: getEndpointExpectNull :: line 71"  data: no]
 [test_subscription_change.html]
 skip-if = os == "win" # Bug 1373346
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_subscription_change.html:: togglePermission :: line 42"  data: no] - Should not throw any errors
 [test_data.html]
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: https://example.org/tests/dom/push/test/test_data.html:: subscribe :: line 61"  data: no] - Should not throw any errors
 skip-if = os == "win" # Bug 1373346
 scheme = https
 [test_try_registering_offline_disabled.html]
 skip-if = os == "win" # Bug 1373346
-fail-if = (xorigin && fission) # [Exception... "Unexpected error"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: http://mochi.test:8888/tests/dom/push/test/test_try_registering_offline_disabled.html:: getEndpointExpectNull :: line 72"  data: no]
 [test_serviceworker_lifetime.html]
 skip-if = serviceworker_e10s || !e10s || os == "win" || os =="linux" && bits == 64 || os =="mac" # e10s: Bug 1433689, Windows: Bug 1373346, Bug 1578333, Bug 1578374 
 [test_error_reporting.html]
--- a/dom/reporting/tests/common_deprecated.js
+++ b/dom/reporting/tests/common_deprecated.js
@ -29,7 +29,6 @@ function test_deprecatedInterface() {
      is(
        report.body.sourceFile,
        location.href
-          .split("?")[0]
          .replace("test_deprecated.html", "common_deprecated.js")
          .replace("worker_deprecated.js", "common_deprecated.js"),
        "We have a sourceFile"
@ -81,7 +80,6 @@ function test_deprecatedMethod() {
      is(
        report.body.sourceFile,
        location.href
-          .split("?")[0]
          .replace("test_deprecated.html", "common_deprecated.js")
          .replace("worker_deprecated.js", "common_deprecated.js"),
        "We have a sourceFile"
@ -133,7 +131,6 @@ function test_deprecatedAttribute() {
      is(
        report.body.sourceFile,
        location.href
-          .split("?")[0]
          .replace("test_deprecated.html", "common_deprecated.js")
          .replace("worker_deprecated.js", "common_deprecated.js"),
        "We have a sourceFile"
--- a/dom/reporting/tests/mochitest.ini
+++ b/dom/reporting/tests/mochitest.ini
@ -6,7 +6,6 @@ prefs =

 [test_deprecated.html]
 support-files = common_deprecated.js worker_deprecated.js
-fail-if = xorigin # Hardcoded line numbers in common_deprecated are all off by 1-2
 [test_memoryPressure.html]
 [test_delivering.html]
 support-files = delivering.sjs iframe_delivering.html worker_delivering.js
--- a/dom/security/test/csp/mochitest.ini
+++ b/dom/security/test/csp/mochitest.ini
@ -246,6 +246,7 @@ prefs =
 [test_connect-src.html]
 [test_CSP.html]
 [test_bug1452037.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_allow_https_schemes.html]
 [test_bug663567.html]
 [test_bug802872.html]
@ -376,6 +377,7 @@ support-files =
  worker_helper.js
  main_csp_worker.html
  main_csp_worker.html^headers^
+skip-if = xorigin # CPP errors, 'NS_FAILED(rv)', file /builds/worker/checkouts/gecko/caps/ContentPrincipal.cpp, line 398
 [test_nonce_snapshot.html]
 support-files =
  file_nonce_snapshot.sjs
--- a/dom/security/test/general/mochitest.ini
+++ b/dom/security/test/general/mochitest.ini
@ -46,7 +46,7 @@ fail-if = xorigin
 [test_same_site_cookies_from_script.html]
 fail-if = xorigin
 [test_same_site_cookies_redirect.html]
-fail-if = xorigin
+skip-if = xorigin # Hangs,  WARNING: 'NS_FAILED(rv)', file /builds/worker/checkouts/gecko/caps/ContentPrincipal.cpp, line 398
 [test_same_site_cookies_toplevel_set_cookie.html]
 fail-if = xorigin # Cookies not set
 [test_same_site_cookies_iframe.html]
--- a/dom/security/test/https-only/mochitest.ini
+++ b/dom/security/test/https-only/mochitest.ini
@ -6,10 +6,9 @@ support-files =
  file_upgrade_insecure_wsh.py
 prefs =
  security.mixed_content.upgrade_display_content=false
+skip-if = xorigin

 [test_resource_upgrade.html]
 scheme=https
-skip-if = (xorigin && fission)
 [test_redirect_upgrade.html]
 scheme=https
-fail-if = xorigin
--- a/dom/security/test/mixedcontentblocker/mochitest.ini
+++ b/dom/security/test/mixedcontentblocker/mochitest.ini
@ -29,5 +29,5 @@ skip-if = (os=='linux' && bits==32) || headless || tsan # Linux32:bug 1324870; H
 [test_frameNavigation.html]
 fail-if = fission
 skip-if = webrender || (debug && (os == 'linux' || os == 'win')) || (os == 'win' && !debug) # webrender: bug 1424752 # Bug 1391823; Bug 1353608
-  || (xorigin && fission) # Application time out
+  || xorigin  # Application time out
 [test_redirect.html]
--- a/dom/security/test/sri/mochitest.ini
+++ b/dom/security/test/sri/mochitest.ini
@ -38,9 +38,14 @@ support-files =
  style_imported.css

 [test_script_sameorigin.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_script_crossdomain.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_sri_disabled.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_style_crossdomain.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_style_sameorigin.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_bug_1271796.html]
 [test_bug_1364262.html]
--- a/dom/tests/mochitest/bugs/mochitest.ini
+++ b/dom/tests/mochitest/bugs/mochitest.ini
@ -105,7 +105,6 @@ fail-if = xorigin
 [test_bug585240.html]
 [test_bug585819.html]
 [test_bug593174.html]
-fail-if = (xorigin && fission) # Session History, uncaught exception - NS_NOINTERFACE: at iframeLoaded@http://mochi.test:8888/tests/dom/tests/mochitest/bugs/test_bug593174.html?currentTestURL=dom%2Ftests%2Fmochitest%2Fbugs%2Ftest_bug593174.html&closeWhenDone=1&showTestReport=false&expected=pass:38:13
 [test_bug61098.html]
 [test_bug612267.html]
 [test_bug617296.html]
--- a/dom/tests/mochitest/dom-level1-core/mochitest.ini
+++ b/dom/tests/mochitest/dom-level1-core/mochitest.ini
@ -521,7 +521,6 @@ skip-if = verify
 [test_nodereplacechildnomodificationallowederrEE.html]
 [test_nodereplacechildoldchildnonexistent.html]
 [test_nodesetnodevaluenomodificationallowederr.html]
-skip-if = (xorigin && fission) # [failure as todo] Test threw exception: TypeError: doc.createEntityReference is not a function
 [test_nodesetnodevaluenomodificationallowederrEE.html]
 [test_nodetextnodeattribute.html]
 [test_nodetextnodename.html]
--- a/dom/tests/mochitest/general/mochitest.ini
+++ b/dom/tests/mochitest/general/mochitest.ini
@ -91,7 +91,6 @@ skip-if = headless # bug 1403542
 [test_focus_legend_noparent.html]
 [test_for_of.html]
 [test_framedhistoryframes.html]
-fail-if = (xorigin && fission) # Session history, NS_ERROR_FAILURE: at run_test@http://mochi.test:8888/tests/dom/tests/mochitest/general/historyframes.html:61:18
 [test_frameElementWrapping.html]
 [test_img_mutations.html]
 skip-if = verify
@ -123,6 +122,7 @@ skip-if = verify
 [test_resource_timing_frameset.html]
 [test_selectevents.html]
 skip-if = toolkit == 'android' # bug 1627523
+  || xorigin
 [test_showModalDialog_removed.html]
 [test_storagePermissionsAccept.html]
 [test_storagePermissionsLimitForeign.html]
--- a/dom/tests/mochitest/geolocation/mochitest.ini
+++ b/dom/tests/mochitest/geolocation/mochitest.ini
@ -10,49 +10,34 @@ prefs =
  dom.security.featurePolicy.enabled=true
  dom.security.featurePolicy.header.enabled=true
  dom.security.featurePolicy.webidl.enabled=true
+skip-if = xorigin

 [test_allowCurrent.html]
-skip-if = xorigin  # Hangs
 [test_allowWatch.html]
-skip-if = xorigin  # Hangs
 [test_cachedPosition.html]
-fail-if = xorigin  
 [test_cancelCurrent.html]
 [test_cancelWatch.html]
 [test_clearWatch.html]
-skip-if = xorigin  # Hangs
 [test_clearWatchBeforeAllowing.html]
-skip-if = xorigin  # Hangs
 [test_clearWatch_invalid.html]
 [test_crossorigin_iframe.html]
 support-files = crossorigin_iframe.html
-fail-if = xorigin
 [test_errorcheck.html]
-fail-if = xorigin
 [test_geolocation_is_undefined_when_pref_is_off.html]
 support-files = test_geolocation_is_undefined_when_pref_is_off_iframe.html
 [test_manyCurrentConcurrent.html]
-fail-if = xorigin
 [test_manyCurrentSerial.html]
-skip-if = xorigin  # Hangs
 [test_manyWatchConcurrent.html]
-fail-if = xorigin
 [test_manyWatchSerial.html]
-skip-if = xorigin  # Hangs
 [test_manyWindows.html]
 [test_optional_api_params.html]
 [test_shutdown.html]
-fail-if = xorigin
 [test_timeoutCurrent.html]
-fail-if = xorigin
 [test_timerRestartWatch.html]
-skip-if = xorigin # Hangs
 [test_windowClose.html]
 [test_worseAccuracyDoesNotBlockCallback.html]
-skip-if = xorigin # Hangs
 [test_featurePolicy.html]
 support-files = file_featurePolicy.html
-fail-if = xorigin

 # This test REQUIRES to run on HTTP (_NOT_ HTTPS).
 [test_geoWatchPositionBlockedInInsecureContext.html]
--- a/dom/tests/mochitest/localstorage/mochitest.ini
+++ b/dom/tests/mochitest/localstorage/mochitest.ini
@ -26,23 +26,28 @@ support-files =
 skip-if = verify
 [test_cookieBlock.html]
 [test_embededNulls.html]
+fail-if = xorigin
 [test_keySync.html]
 [test_localStorageBase.html]
 skip-if = e10s
 [test_localStorageBaseSessionOnly.html]
 [test_localStorageCookieSettings.html]
-fail-if = (xorigin && fission) # Setting localStorageItem should not throw a security exception
+fail-if = xorigin
 [test_localStorageEnablePref.html]
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_localStorageKeyOrder.html]
+fail-if = xorigin # uncaught exception - SecurityError: The operation is insecure. at startTest@http://mochi.test:8888/tests/dom/tests/mochitest/localstorage/test_localStorageKeyOrder.html:59:5, interOriginTest.js:31:7, test_storageConstructor.html:13:3
 [test_localStorageOriginsDiff.html]
 [test_localStorageOriginsDomainDiffs.html]
 [test_localStorageOriginsEquals.html]
 [test_localStorageOriginsPortDiffs.html]
 [test_localStorageOriginsSchemaDiffs.html]
 [test_localStorageQuota.html]
+fail-if = xorigin # SecurityError: The operation is insecure. at onMessageReceived@http://mochi.test:8888/tests/dom/tests/mochitest/localstorage/interOriginTest.js:31:7, but passes locally
 [test_localStorageQuotaSessionOnly.html]
 skip-if = true # bug 1611317
 [test_localStorageQuotaSessionOnly2.html]
 skip-if = true # bug 1347690
 [test_localStorageReplace.html]
 [test_storageConstructor.html]
+fail-if = xorigin # SecurityError: The operation is insecure. at onMessageReceived@http://mochi.test:8888/tests/dom/tests/mochitest/localstorage/interOriginTest.js:31:7, but passes locally
--- a/dom/tests/mochitest/storageevent/mochitest.ini
+++ b/dom/tests/mochitest/storageevent/mochitest.ini
@ -9,6 +9,7 @@ support-files =
  frameSessionStorageSlaveNotEqual.html
  interOriginFrame.js
  interOriginTest2.js
+skip-if = xorigin

 [test_storageLocalStorageEventCheckNoPropagation.html]
 [test_storageLocalStorageEventCheckPropagation.html]
--- a/dom/u2f/tests/mochitest.ini
+++ b/dom/u2f/tests/mochitest.ini
@ -18,26 +18,19 @@ support-files =
 scheme = https

 # Feature does not function without e10s (Disabled in Bug 1297552)
-skip-if = !e10s
+skip-if = xorigin || !e10s

 [test_bind.html]
 [test_polyfill_interaction.html]
 [test_u2f_replaceable.html]
 [test_util_methods.html]
 [test_no_token.html]
-skip-if = xorigin # Hangs
 [test_register.html]
-skip-if = xorigin # Hangs
 [test_register_sign.html]
-skip-if = xorigin # Hangs
 [test_appid_facet.html]
-skip-if = xorigin # Hangs
 [test_appid_facet_insecure.html]
 scheme = http
 [test_appid_facet_subdomain.html]
-skip-if = xorigin # Hangs
 [test_multiple_keys.html]
-skip-if = xorigin # Hangs
 [test_override_request.html]
 skip-if = toolkit == 'android' && !is_fennec # Bug 1530681
-  || xorigin # Hangs
--- a/dom/webauthn/tests/mochitest.ini
+++ b/dom/webauthn/tests/mochitest.ini
@ -4,30 +4,20 @@ support-files =
  u2futil.js
  pkijs/*
  get_assertion_dead_object.html
-skip-if = !e10s || os == 'android'
+skip-if = xorigin || !e10s || os == 'android'
 scheme = https

 [test_webauthn_abort_signal.html]
-fail-if = (xorigin && !fission)
 [test_webauthn_attestation_conveyance.html]
-fail-if = (xorigin && !fission) # NotAllowedError
 [test_webauthn_authenticator_selection.html]
-fail-if = (xorigin && !fission) # NotAllowedError
 [test_webauthn_authenticator_transports.html]
-fail-if = (xorigin && !fission) # NotAllowedError
 [test_webauthn_loopback.html]
-skip-if = (xorigin && !fission) # JavaScript error: https://example.org/tests/SimpleTest/SimpleTest.js, line 76: DataCloneError: The object could not be cloned.
 [test_webauthn_no_token.html]
-skip-if = xorigin # JavaScript error: https://example.org/tests/SimpleTest/SimpleTest.js, line 76: DataCloneError: The object could not be cloned.
 [test_webauthn_make_credential.html]
-fail-if = (xorigin && !fission) # NotAllowedError
 [test_webauthn_get_assertion.html]
-fail-if = (xorigin && !fission) # NotAllowedError
 [test_webauthn_get_assertion_dead_object.html]
 [test_webauthn_override_request.html]
 [test_webauthn_store_credential.html]
-fail-if = (xorigin && !fission) # NotAllowedError
 [test_webauthn_sameorigin.html]
-fail-if = xorigin # NotAllowedError
 [test_webauthn_isplatformauthenticatoravailable.html]
 [test_webauthn_isexternalctap2securitykeysupported.html]
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@ -112,6 +112,7 @@ support-files =
 [test_blobWorkers.html]
 [test_bug949946.html]
 [test_bug978260.html]
+skip-if = xorigin #  [Child][MessageChannel] Error: (msgtype=0x38006F,name=PContent::Reply_CrossProcessRedirect) Channel closing: too late to send/recv, messages will be lost, [Parent][MessageChannel] Error: (msgtype=0x20007A,name=PBrowser::Msg_StopIMEStateManagement) Closed channel: cannot send/recv
 [test_bug998474.html]
 [test_bug1002702.html]
 [test_bug1010784.html]
@ -179,6 +180,7 @@ support-files =
  sharedWorker_thirdparty_window.html
 [test_simpleThread.html]
 [test_suspend.html]
+fail-if = xorigin # Strip query parameters from xorigin url
 [test_terminate.html]
 [test_threadErrors.html]
 [test_threadTimeouts.html]
@ -189,6 +191,7 @@ support-files =
 [test_worker_interfaces_secureContext.html]
 scheme=https
 [test_referrer.html]
+fail-if = xorigin
 [test_referrer_header_worker.html]
 [test_importScripts_3rdparty.html]
 [test_sharedWorker_ports.html]
--- a/dom/workers/test/test_referrer.html
+++ b/dom/workers/test/test_referrer.html
@ -32,7 +32,7 @@
  function test_importScript() {
    var worker = new Worker("worker_referrer.js");
    worker.onmessage = function(e) {
-      is(e.data, location.href.replace("test_referrer.html", "worker_referrer.js").split("?")[0], "The referrer has been sent.");
+      is(e.data, location.href.replace("test_referrer.html", "worker_referrer.js"), "The referrer has been sent.");
      next();
    }
    worker.postMessage(42);
--- a/dom/workers/test/test_suspend.html
+++ b/dom/workers/test/test_suspend.html
@ -18,7 +18,7 @@

  SimpleTest.waitForExplicitFinish();

-  const BLANK_URI = location.href.replace("test_suspend.html", "blank.html").split("?")[0];
+  const BLANK_URI = location.href.replace("test_suspend.html", "blank.html");

  var lastCount;

@ -107,7 +107,7 @@

    var newLocation = location.href.replace("test_suspend.html",
                                            "suspend_window.html");
-    is(testWin.location.href, newLocation.split("?")[0], "Wrong url!");
+    is(testWin.location.href, newLocation, "Wrong url!");
    is(resumed, true, "Got message before resumed!");
    is(lastCount, data - 1, "Missed a message, suspend failed!");
    finishTest();
--- a/dom/xhr/tests/mochitest.ini
+++ b/dom/xhr/tests/mochitest.ini
@ -83,7 +83,7 @@ support-files = window_worker_xhr_3rdparty.html
 [test_worker_xhr_headers.html]
 [test_worker_xhr_implicit_cancel.html]
 [test_worker_xhr_parameters.html]
-fail-if = (xorigin && fission)
+fail-if = xorigin
 [test_worker_xhr_responseURL.html]
 [test_worker_xhr_system.html]
 [test_worker_xhr_timeout.html]
@ -105,7 +105,6 @@ skip-if = (os == "win") || (os == "mac")
 support-files = test_XHR_timeout.js
 [test_xhr_withCredentials.html]
 [test_XHRDocURI.html]
-fail-if = (xorigin && fission) # Session History, dom/xhr/tests/test_XHRDocURI.html:457
 [test_XHRResponseURL.html]
 [test_XHRSendData.html]
 [test_sync_xhr_document_write_with_iframe.html]
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@ -143,7 +143,6 @@ skip-if = headless
 [test_bug757371.html]
 [test_bug757771.html]
 [test_bug767684.html]
-skip-if = (xorigin && fission) # application crashed [@ std::_Function_handler<void (bool&&), mozilla::dom::CanonicalBrowsingContext::PendingRemotenessChange::Complete(mozilla::dom::ContentParent*)::$_12>::_M_invoke(std::_Any_data const&, bool&&)]
 [test_bug772796.html]
 [test_bug773262.html]
 [test_bug780035.html]
@ -223,8 +222,7 @@ skip-if = headless
 [test_bug1399722.html]
 [test_bug1406726.html]
 [test_bug1409520.html]
-[test_bug1425997.html] 
-skip-if = xorigin 
+[test_bug1425997.html]
 [test_bug1497480.html]
 skip-if = toolkit == 'android'
 [test_bug1543312.html]
@ -291,7 +289,7 @@ skip-if = headless
 [test_resizers_appearance.html]
 [test_resizers_resizing_elements.html]
 skip-if = (verify && debug && os == 'win') # bug 1485293
-fail-if = (xorigin && fission) # Resizers for <img>: The width should be increased by 10 pixels - got 150, expected 160 epsilon: +/- 2
+fail-if = xorigin
 [test_root_element_replacement.html]
 [test_select_all_without_body.html]
 [test_setting_value_longer_than_maxlength_with_setUserInput.html]
--- a/gfx/layers/apz/test/mochitest/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest/mochitest.ini
@ -21,23 +21,25 @@
 [test_group_fullscreen.html]
  run-if = (os == 'android')
 [test_group_mainthread.html]
-skip-if = (xorigin && fission)
+  skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_group_minimum_scale_size.html]
  run-if = (os == 'android')
 [test_group_mouseevents.html]
  skip-if = (toolkit == 'android') # mouse events not supported on mobile
-    || (xorigin && fission) # Hangs
+    || xorigin  # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_group_pointerevents.html]
  skip-if = (os == 'win' && os_version == '10.0') # Bug 1404836
+    || xorigin  # Application time out
 [test_group_touchevents.html]
  skip-if = (verify && debug && (os == 'win'))
-    || (xorigin && fission) # Hangs
+    || xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_group_touchevents-2.html]
  skip-if = (verify && debug && (os == 'win'))
 [test_group_touchevents-3.html]
  skip-if = (verify && debug && (os == 'win'))
 [test_group_touchevents-4.html]
  skip-if = (verify && debug && (os == 'win'))
+    || xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_group_wheelevents.html]
  skip-if = (toolkit == 'android') # wheel events not supported on mobile
 [test_group_zoom.html]
@ -47,6 +49,7 @@ skip-if = (xorigin && fission)
 [test_group_double_tap_zoom.html]
  run-if = (os == 'android') # FIXME: enable on desktop (see bug 1608506 comment 4)
 [test_interrupted_reflow.html]
+ fail-if = xorigin
 [test_group_keyboard.html]
 [test_layerization.html]
  skip-if = (os == 'android') # wheel events not supported on mobile
@ -68,6 +71,7 @@ skip-if = (xorigin && fission)
  skip-if = (toolkit == 'android') # wheel events not supported on mobile
 [test_group_hittest.html]
  skip-if = (toolkit == 'android') # mouse events not supported on mobile
+    || xorigin # Hangs in helper_hittest_spam.html
 [test_group_zoomToFocusedInput.html]
 [test_group_scroll_snap.html]
  skip-if = (os == 'android') # wheel events not supported on mobile
--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@ -136,7 +136,6 @@ skip-if = verify
 [test_bug1180105.html]
 [test_bug1217571.html]
 [test_bug1325080.html]
-skip-if = (xorigin && fission) # Session History, JavaScript error: http://mochi.test:8888/tests/image/test/mochitest/test_bug1325080.html?currentTestURL=image%2Ftest%2Fmochitest%2Ftest_bug1325080.html&closeWhenDone=undefined&showTestReport=true&expected=pass, line 21: NS_NOINTERFACE:
 [test_bullet_animation.html]
 [test_changeOfSource.html]
 [test_changeOfSource2.html]
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@ -61,7 +61,7 @@ support-files =
  bug583889_inner2.html
 [test_bug588174.html]
 [test_bug603550.html]
-fail-if = (xorigin && fission)
+fail-if = xorigin
 [test_bug607529.html]
 support-files =
  file_bug607529.html
@ -88,19 +88,14 @@ support-files =
 support-files =
  file_bug842853-frame.html
 skip-if = toolkit == 'android' # Bug 1355821
-fail-if = (xorigin && fission)
 [test_bug842853-2.html]
 skip-if = toolkit == 'android' # Bug 1355821
-fail-if = (xorigin && fission)
 [test_bug849219.html]
-fail-if = (xorigin && fission) # Session History, JavaScript error: http://mochi.test:8888/tests/dom/tests/mochitest/bugs/test_bug593174.html?currentTestURL=dom%2Ftests%2Fmochitest%2Fbugs%2Ftest_bug593174.html&closeWhenDone=1&showTestReport=false&expected=pass, line 38: NS_NOINTERFACE:
 [test_bug851445.html]
 skip-if = toolkit == 'android' # Bug 1355821
-fail-if = (xorigin && fission)
 support-files = bug851445_helper.html
 [test_bug851485.html]
 skip-if = toolkit == 'android' # Bug 1355821
-  || (xorigin && fission) # Hangs, undefined assertion name - got 4904, expected 500
 [test_bug858459.html]
 skip-if = toolkit == 'android' # Bug 1355822
 [test_bug968148.html]
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@ -105,7 +105,6 @@ support-files = file_bug1307853.html
 support-files = file_bug1566783.html
 [test_bug1642588.html]
 [test_bug1644511.html]
-fail-if = xorigin
 [test_contained_plugin_transplant.html]
 skip-if = os=='win'
 [test_crash_on_mouse_move.html]
@ -158,10 +157,8 @@ support-files =
    file_scroll_position_restore_no_bfcache.html
    slow-stylesheet.sjs
 [test_scroll_position_restore_after_stop.html]
-skip-if = (xorigin && fission) # Mozilla crash reason: MOZ_ASSERT(mInFlightProcessId == 0)
 [test_scroll_animation_restore.html]
 [test_scroll_position_iframe.html]
-ail-if = (xorigin && fission)
 [test_grid_track_sizing_algo_001.html]
 skip-if = debug == true || tsan # the test is slow. tsan: bug 1612707
 [test_grid_track_sizing_algo_002.html]
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@ -96,9 +96,6 @@ let xOriginRunner = {
  expectAssertions(min, max) {
    this.callHarnessMethod("runner", "expectAssertions", min, max);
  },
-  expectChildProcessCrash() {
-    this.callHarnessMethod("runner", "expectChildProcessCrash");
-  },
  requestLongerTimeout(factor) {
    this.harnessWindow.postMessage(
      {
--- a/testing/mochitest/tests/SimpleTest/TestRunner.js
+++ b/testing/mochitest/tests/SimpleTest/TestRunner.js
@ -943,7 +943,6 @@ var xOriginDispatchMap = {
  logger: TestRunner.structuredLogger,
  addFailedTest: TestRunner.addFailedTest,
  expectAssertions: TestRunner.expectAssertions,
-  expectChildProcessCrash: TestRunner.expectChildProcessCrash,
  requestLongerTimeout: TestRunner.requestLongerTimeout,
  testUnloaded: TestRunner.testUnloaded,
  "structuredLogger.deactivateBuffering":
--- a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@ -53,15 +53,15 @@ skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_highlight_non_login.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
-  || (xorigin && fission)
+  || xorigin # Hangs
 [test_autocomplete_https_downgrade.html]
 scheme = http # Tests downgrading
 skip-if = toolkit == 'android'  || (os == 'linux' && debug) # autocomplete && Bug 1554959 for linux debug disable
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_autocomplete_https_upgrade.html]
 scheme = https
 skip-if = toolkit == 'android'  || (os == 'linux' && debug) # autocomplete && Bug 1554959 for linux debug disable
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_autocomplete_password_generation.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
@ -69,7 +69,6 @@ skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_password_generation_confirm.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
-  || (xorigin && fission)
 [test_autocomplete_password_open.html]
 scheme = https
 skip-if = toolkit == 'android' || verify # autocomplete
@ -88,13 +87,13 @@ skip-if = toolkit == 'android' # bug 1533965
 [test_autofill_different_formActionOrigin.html]
 scheme = https
 skip-if = toolkit == 'android' # Bug 1259768
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_autofill_different_subdomain.html]
 scheme = https
 skip-if = toolkit == 'android' # Bug 1259768
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_autofill_from_bfcache.html]
-fail-if = xorigin || fission
+fail-if = fission
 scheme = https
 skip-if = toolkit == 'android' # bug 1527403
 [test_autofill_hasBeenTypePassword.html]
@ -102,57 +101,54 @@ scheme = https
 skip-if = xorigin # Hangs
 [test_autofill_highlight.html]
 scheme = https
-fail-if = xorigin
 skip-if = toolkit == 'android' # Bug 1531185
-  || (xorigin && fission)
+  || xorigin # Hangs
 [test_autofill_highlight_empty_username.html]
 scheme = https
-fail-if = xorigin
-skip-if = (xorigin && fission)
 [test_autofill_https_downgrade.html]
 scheme = http  # we need http to test handling of https logins on http forms
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_autofill_https_upgrade.html]
 skip-if = toolkit == 'android' # Bug 1259768
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_autofill_sandboxed.html]
 scheme = https
 skip-if = toolkit == 'android'
 [test_autofill_password-only.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_autofocus_js.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
-  || xorigin # JavaScript error: , line 0: uncaught exception: Waiting for rowcount change: 3 First value: name - timed out after 50 tries.
+  || xorigin # Hangs
 [test_basic_form.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_0pw.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_1pw.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_1pw_2.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_2pw_1.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_2pw_2.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_3pw_1.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_honor_autocomplete_off.html]
 scheme = https
 skip-if = toolkit == 'android' # android:autocomplete.
  || xorigin # Hangs
 [test_password_field_autocomplete.html]
 skip-if = toolkit == 'android' # android:autocomplete.
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_insecure_form_field_no_saved_login.html]
 skip-if = toolkit == 'android' # android:autocomplete.
 [test_basic_form_html5.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_pwevent.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_basic_form_pwonly.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_bug_627616.html]
 skip-if = toolkit == 'android' # Tests desktop prompts
 [test_bug_776171.html]
@ -161,19 +157,19 @@ skip-if = toolkit == 'android' # autocomplete
  || xorigin # Hangs
 scheme = https
 [test_form_action_1.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_form_action_2.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_form_action_javascript.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
 [test_formless_autofill.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_formless_submit.html]
 skip-if = toolkit == 'android' && debug # bug 1397615
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_formless_submit_navigation.html]
 skip-if = toolkit == 'android' && debug # bug 1397615
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_formless_submit_navigation_negative.html]
 skip-if = toolkit == 'android' && debug # bug 1397615
  || xorigin # Hangs
@ -190,11 +186,11 @@ support-files =
  chrome_timeout.js
  subtst_master_pass.html
 [test_maxlength.html]
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_munged_values.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1527403
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_one_doorhanger_per_un_pw.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1535505
@ -203,7 +199,7 @@ skip-if = toolkit == 'android' # bug 1535505
 skip-if = xorigin # Hangs
 [test_prompt.html]
 skip-if = os == "linux" || toolkit == 'android' # Tests desktop prompts
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_prompt_async.html]
 skip-if = toolkit == 'android' || (debug || asan || tsan) # Tests desktop prompts # Bug 1603659
 support-files = subtst_prompt_async.html
@ -214,7 +210,7 @@ skip-if = toolkit == 'android' # Tests desktop prompts.
 [test_password_length.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1527403
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_prompt_promptAuth.html]
 skip-if = os == "linux" || toolkit == 'android' # Tests desktop prompts
 [test_prompt_promptAuth_proxy.html]
@ -223,10 +219,10 @@ skip-if = e10s || os == "linux" || toolkit == 'android' # Tests desktop prompts
 [test_submit_without_field_modifications.html]
 support-files =
  subtst_prefilled_form.html
-skip-if = (xorigin && fission) # Hangs
+skip-if = xorigin # Hangs
 [test_username_focus.html]
 skip-if = toolkit == 'android' # android:autocomplete.
-  || (xorigin && fission) # Hangs
+  || xorigin # Hangs
 [test_xhr.html]
 skip-if = toolkit == 'android' # Tests desktop prompts
 fail-if = xorigin
--- a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
@ -52,16 +52,10 @@ skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [test_cachemiss.html]
 skip-if = verify
 [test_annotation_vs_TP.html]
-skip-if = (xorigin && !fission) # The resource at “<URL>” was blocked because content blocking is enabled.
 [test_fingerprinting.html]
-fail-if = (xorigin && !fission)
 [test_fingerprinting_annotate.html]
-skip-if = (xorigin && !fission)
 [test_cryptomining.html]
-fail-if = (xorigin && !fission) # The resource at “<URL>” was blocked because content blocking is enabled.
+skip-if = xorigin # Crashes at runtests.py: IOError: [Errno 2] No such file or directory: u'/builds/worker/workspace/build/symbols/libc.so.6/BAC017B4C57C06CFD1D1BED6652CEDB90/libc.so.6.sym'
 [test_cryptomining_annotate.html]
-skip-if = (xorigin && !fission) # The resource at “<URL>” was blocked because content blocking is enabled.
 [test_socialtracking.html]
-fail-if = (xorigin && !fission)
 [test_socialtracking_annotate.html]
-skip-if = (xorigin && !fission)
--- a/toolkit/content/tests/widgets/mochitest.ini
+++ b/toolkit/content/tests/widgets/mochitest.ini
@ -24,8 +24,7 @@ support-files =

 [test_audiocontrols_dimensions.html]
 [test_mousecapture_area.html]
-skip-if = (verify && debug)
-  || (xorigin && fission) # Inconsistent pass/fail in treeherder
+skip-if = (xorigin && debug) || (verify && debug)
 [test_ua_widget_sandbox.html]
 [test_ua_widget_unbind.html]
 [test_videocontrols.html]