Skip to content

Commit e57df5e

Browse files
committed
Bug 1583386: Part 2 - Enable DocumentChannel in mochitest Fission runs. r=mattwoodrow,ahal
Differential Revision: https://phabricator.services.mozilla.com/D47009 --HG-- extra : moz-landing-system : lando
1 parent 790387c commit e57df5e

File tree

9 files changed

+26
-9
lines changed

9 files changed

+26
-9
lines changed

browser/base/content/test/tabs/browser.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ support-files =
2626
file_about_child.html
2727
file_about_parent.html
2828
[browser_e10s_switchbrowser.js]
29-
fail-if = fission
3029
[browser_e10s_about_process.js]
3130
[browser_e10s_mozillaweb_process.js]
3231
[browser_e10s_chrome_process.js]

browser/base/content/test/trackingUI/browser.ini

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,51 @@ support-files =
1313

1414
[browser_trackingUI_3.js]
1515
[browser_trackingUI_animation.js]
16+
skip-if = fission # Times out under Fission with DocumentChannel enabled.
1617
[browser_trackingUI_animation_2.js]
18+
skip-if = fission # Times out under Fission with DocumentChannel enabled.
1719
[browser_trackingUI_appMenu.js]
1820
[browser_trackingUI_background_tabs.js]
21+
skip-if = fission # Times out under Fission with DocumentChannel enabled.
1922
[browser_trackingUI_categories.js]
2023
skip-if = fission && debug # Causing crashes [@ mozilla::net::HttpChannelChild::DoOnStartRequest(nsIRequest*, nsISupports*)]
2124
[browser_trackingUI_cookies_subview.js]
2225
skip-if = fission
2326
[browser_trackingUI_cryptominers.js]
24-
skip-if = fission && debug # Causing crashes [@ mozilla::net::HttpChannelChild::DoOnStartRequest(nsIRequest*, nsISupports*)]
27+
skip-if =
28+
fission && debug || # Causing crashes [@ mozilla::net::HttpChannelChild::DoOnStartRequest(nsIRequest*, nsISupports*)]
29+
fission # Times out under Fission with DocumentChannel enabled.
2530
[browser_trackingUI_fetch.js]
2631
skip-if = fission && debug # Causing crashes [@ mozilla::net::HttpChannelChild::DoOnStartRequest(nsIRequest*, nsISupports*)]
2732
support-files =
2833
file_trackingUI_fetch.html
2934
file_trackingUI_fetch.js
3035
file_trackingUI_fetch.js^headers^
3136
[browser_trackingUI_fingerprinters.js]
37+
skip-if = fission # Times out under Fission with DocumentChannel enabled.
3238
[browser_trackingUI_open_preferences.js]
39+
skip-if = fission # Times out under Fission with DocumentChannel enabled.
3340
[browser_trackingUI_pbmode_exceptions.js]
3441
skip-if = fission # Crashes: @ mozilla::dom::BrowserBridgeParent::RecvShow(mozilla::gfx::IntSizeTyped<mozilla::ScreenPixel> const&, bool const&, nsSizeMode const&)
3542
[browser_trackingUI_report_breakage.js]
3643
skip-if = fission || debug || asan # Bug 1546797
3744
[browser_trackingUI_socialtracking.js]
38-
skip-if = fission && debug # Crashes: @ mozilla::net::HttpChannelChild::DoOnStartRequest(nsIRequest*, nsISupports*)
45+
skip-if =
46+
fission && debug || # Crashes: @ mozilla::net::HttpChannelChild::DoOnStartRequest(nsIRequest*, nsISupports*)
47+
fission # Times out under Fission with DocumentChannel enabled.
3948
[browser_trackingUI_shield_visibility.js]
4049
skip-if = fission && debug #Bug 1574939
4150
[browser_trackingUI_state.js]
4251
skip-if = serviceworker_e10s || (fission && debug) # see https://bugzilla.mozilla.org/show_bug.cgi?id=1511303#c1 #Bug 1574939
4352
[browser_trackingUI_state_reset.js]
44-
skip-if = fission && debug #Bug 1574939
53+
skip-if =
54+
fission && debug || #Bug 1574939
55+
fission # Times out under Fission with DocumentChannel enabled.
4556
[browser_trackingUI_telemetry.js]
46-
skip-if = fission && debug #Bug 1574939
57+
skip-if =
58+
fission && debug || #Bug 1574939
59+
fission # Times out under Fission with DocumentChannel enabled.
4760
[browser_trackingUI_trackers_subview.js]
48-
skip-if = fission && debug #Bug 1574939
61+
skip-if =
62+
fission && debug || #Bug 1574939
63+
fission # Times out under Fission with DocumentChannel enabled.

browser/components/extensions/test/browser/browser.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ skip-if = os == "linux" && debug && bits == 32 # Bug 1350189
220220
[browser_ext_tabs_discard.js]
221221
skip-if = !e10s
222222
[browser_ext_tabs_discarded.js]
223-
fail-if = fission
224223
[browser_ext_tabs_duplicate.js]
225224
[browser_ext_tabs_events.js]
226225
skip-if = true # Bug 1521363

browser/components/safebrowsing/content/test/browser.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ support-files =
99
skip-if = os == "mac" || e10s # e10s: Bug 1248632
1010
[browser_whitelisted.js]
1111
[browser_mixedcontent_aboutblocked.js]
12+
skip-if = fission # Times out under Fission with DocumentChannel enabled.

dom/tests/mochitest/ajax/offline/browser.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ support-files =
55
file_simpleManifest.cacheManifest
66

77
[browser_disableAppcache.js]
8+
fail-if = fission
89
skip-if = !e10s || (toolkit == 'android') || debug # Slow

taskcluster/taskgraph/transforms/tests.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ def fission_filter(test):
160160
'tier': 2,
161161
'mozharness': {
162162
'extra-options': ['--setpref="fission.autostart=true"',
163-
'--setpref="dom.serviceWorkers.parent_intercept=true"'],
163+
'--setpref="dom.serviceWorkers.parent_intercept=true"',
164+
'--setpref="browser.tabs.documentchannel=true"'],
164165
},
165166
},
166167
},

testing/mochitest/mochitest_options.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ def validate(self, parser, options, context):
833833
if options.enable_fission:
834834
options.extraPrefs.append("fission.autostart=true")
835835
options.extraPrefs.append("dom.serviceWorkers.parent_intercept=true")
836+
options.extraPrefs.append("browser.tabs.documentchannel=true")
836837

837838
options.leakThresholds = {
838839
"default": options.defaultLeakThreshold,

toolkit/components/antitracking/test/browser/browser.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ skip-if = fission || (os == "linux" && asan)
6868
[browser_blockingNoOpener.js]
6969
skip-if = fission || (os == "linux" && asan)
7070
[browser_doublyNestedTracker.js]
71+
fail-if = fission # Fails under Fission with DocumentChannel enabled.
7172
[browser_existingCookiesForSubresources.js]
7273
[browser_firstPartyCookieRejectionHonoursAllowList.js]
7374
[browser_imageCache4.js]

toolkit/components/passwordmgr/test/mochitest/mochitest.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,5 @@ skip-if =
163163
fission # Intermittently times out under Fission.
164164
[test_xhr_2.html]
165165
[test_xml_load.html]
166-
fail-if = fission
167166
skip-if = toolkit == 'android' # Tests desktop prompts
168167

0 commit comments

Comments
 (0)