Bug 1588846 - move browser_bug839103.js somewhere more topical and make it pass with fission enabled, r=mccr8
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 15 Oct 2019 19:37:55 +0000
changeset 497763 ddd238ce2201f7eb1a3f2d37c06b2affe029d28c
parent 497762 36752259f6f87338f5b6886dbfdf15ddc865ceb4
child 497764 c7e591ee61c5368f31a48d6317d5521f16594db4
push id98054
push userrmaries@mozilla.com
push dateTue, 15 Oct 2019 23:24:49 +0000
treeherderautoland@c7e591ee61c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1588846, 839103
milestone71.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 1588846 - move browser_bug839103.js somewhere more topical and make it pass with fission enabled, r=mccr8 Differential Revision: https://phabricator.services.mozilla.com/D49322
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_bug839103.js
browser/base/content/test/general/bug839103.css
browser/base/content/test/general/test_bug839103.html
layout/base/tests/browser.ini
layout/base/tests/browser_bug839103.js
layout/base/tests/bug839103.css
layout/base/tests/file_bug839103.html
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -18,17 +18,16 @@ support-files =
   browser_tab_dragdrop2_frame1.xhtml
   browser_tab_dragdrop_embed.html
   browser_web_channel.html
   browser_web_channel_iframe.html
   bug592338.html
   bug792517-2.html
   bug792517.html
   bug792517.sjs
-  bug839103.css
   clipboard_pastefile.html
   discovery.html
   download_page.html
   download_page_1.txt
   download_page_2.txt
   dummy_page.html
   file_documentnavigation_frameset.html
   file_double_close_tab.html
@@ -41,17 +40,16 @@ support-files =
   pinning_headers.sjs
   ssl_error_reports.sjs
   print_postdata.sjs
   searchSuggestionEngine.sjs
   searchSuggestionEngine.xml
   searchSuggestionEngine2.xml
   test_bug462673.html
   test_bug628179.html
-  test_bug839103.html
   title_test.svg
   unknownContentType_file.pif
   unknownContentType_file.pif^headers^
   video.ogg
   web_video.html
   web_video1.ogv
   web_video1.ogv^headers^
   zoom_test.html
@@ -217,19 +215,16 @@ uses-unsafe-cpows = true
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug767836_perwindowpb.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug817947.js]
 skip-if = os == 'linux' && !debug && bits == 64 # Bug 1556066 
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug832435.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_bug839103.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-skip-if = fission
 [browser_bug882977.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug1015721.js]
 skip-if = os == 'win' || (verify && debug && (os == 'linux'))
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_accesskeys.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_clipboard.js]
--- a/layout/base/tests/browser.ini
+++ b/layout/base/tests/browser.ini
@@ -1,11 +1,15 @@
 [DEFAULT]
 
 [browser_bug617076.js]
+[browser_bug839103.js]
+support-files =
+  file_bug839103.html
+  bug839103.css
 [browser_disableDialogs_onbeforeunload.js]
 [browser_onbeforeunload_only_after_interaction.js]
 [browser_onbeforeunload_only_after_interaction_in_frame.js]
 [browser_scroll_into_view_in_out_of_process_iframe.js]
 support-files =
   test_scroll_into_view_in_oopif.html
   scroll_into_view_in_child.html
 [browser_visual_viewport_iframe.js]
rename from browser/base/content/test/general/browser_bug839103.js
rename to layout/base/tests/browser_bug839103.js
--- a/browser/base/content/test/general/browser_bug839103.js
+++ b/layout/base/tests/browser_bug839103.js
@@ -1,31 +1,27 @@
 const gTestRoot = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content/",
   "http://127.0.0.1:8888/"
 );
 
 add_task(async function test() {
   await BrowserTestUtils.withNewTab(
-    { gBrowser, url: "about:blank" },
+    { gBrowser, url: gTestRoot + "file_bug839103.html" },
     async function(browser) {
       await ContentTask.spawn(browser, gTestRoot, testBody);
     }
   );
 });
 
 // This function runs entirely in the content process. It doesn't have access
 // any free variables in this file.
 async function testBody(testRoot) {
   const gStyleSheet = "bug839103.css";
 
-  let loaded = ContentTaskUtils.waitForEvent(this, "load", true);
-  content.location = testRoot + "test_bug839103.html";
-
-  await loaded;
   function unexpectedContentEvent(event) {
     ok(false, "Received a " + event.type + " event on content");
   }
 
   // We've seen the original stylesheet in the document.
   // Now add a stylesheet on the fly and make sure we see it.
   let doc = content.document;
   doc.styleSheetChangeEventsEnabled = true;
rename from browser/base/content/test/general/bug839103.css
rename to layout/base/tests/bug839103.css
rename from browser/base/content/test/general/test_bug839103.html
rename to layout/base/tests/file_bug839103.html