Bug 1591006 - [remote] Re-arrange browser-chrome tests by domains as subfolders. r=remote-protocol-reviewers,maja_zf
authorHenrik Skupin <mail@hskupin.info>
Wed, 30 Oct 2019 13:25:56 +0000
changeset 499780 3070efa2650329a8c6759b3cb9c87bfa4a90318b
parent 499779 a478ac8390169be2fac752abdc4f2ad61fde6415
child 499781 fe92ffb951e88bfd7e43d4ba1964f6415866848b
push id114163
push useraiakab@mozilla.com
push dateThu, 31 Oct 2019 10:03:38 +0000
treeherdermozilla-inbound@5fe1e03dbfbc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersremote-protocol-reviewers, maja_zf
bugs1591006
milestone72.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 1591006 - [remote] Re-arrange browser-chrome tests by domains as subfolders. r=remote-protocol-reviewers,maja_zf Differential Revision: https://phabricator.services.mozilla.com/D51019
remote/test/browser/browser.ini
remote/test/browser/browser_network_requestWillBeSent.js
remote/test/browser/browser_page_bringToFront.js
remote/test/browser/browser_page_captureScreenshot.js
remote/test/browser/browser_page_frameNavigated.js
remote/test/browser/browser_page_frameNavigated_iframe.js
remote/test/browser/browser_page_javascriptDialog_alert.js
remote/test/browser/browser_page_javascriptDialog_beforeunload.js
remote/test/browser/browser_page_javascriptDialog_confirm.js
remote/test/browser/browser_page_javascriptDialog_otherTarget.js
remote/test/browser/browser_page_javascriptDialog_prompt.js
remote/test/browser/browser_page_runtime_events.js
remote/test/browser/browser_runtime_callFunctionOn.js
remote/test/browser/browser_runtime_evaluate.js
remote/test/browser/browser_runtime_executionContext.js
remote/test/browser/browser_runtime_get_properties.js
remote/test/browser/browser_runtime_remote_objects.js
remote/test/browser/browser_target.js
remote/test/browser/browser_target_browserContext.js
remote/test/browser/browser_target_close.js
remote/test/browser/doc_network_requestWillBeSent.html
remote/test/browser/file_network_requestWillBeSent.js
remote/test/browser/network/browser.ini
remote/test/browser/network/browser_requestWillBeSent.js
remote/test/browser/network/doc_requestWillBeSent.html
remote/test/browser/network/file_requestWillBeSent.js
remote/test/browser/network/head.js
remote/test/browser/page/browser.ini
remote/test/browser/page/browser_bringToFront.js
remote/test/browser/page/browser_captureScreenshot.js
remote/test/browser/page/browser_frameNavigated.js
remote/test/browser/page/browser_frameNavigated_iframe.js
remote/test/browser/page/browser_javascriptDialog_alert.js
remote/test/browser/page/browser_javascriptDialog_beforeunload.js
remote/test/browser/page/browser_javascriptDialog_confirm.js
remote/test/browser/page/browser_javascriptDialog_otherTarget.js
remote/test/browser/page/browser_javascriptDialog_prompt.js
remote/test/browser/page/browser_runtimeEvents.js
remote/test/browser/page/head.js
remote/test/browser/runtime/browser.ini
remote/test/browser/runtime/browser_callFunctionOn.js
remote/test/browser/runtime/browser_evaluate.js
remote/test/browser/runtime/browser_executionContext.js
remote/test/browser/runtime/browser_getProperties.js
remote/test/browser/runtime/browser_remoteObjects.js
remote/test/browser/runtime/head.js
remote/test/browser/target/browser.ini
remote/test/browser/target/browser_browserContext.js
remote/test/browser/target/browser_closeTarget.js
remote/test/browser/target/browser_target.js
remote/test/browser/target/head.js
remote/test/moz.build
--- a/remote/test/browser/browser.ini
+++ b/remote/test/browser/browser.ini
@@ -1,34 +1,12 @@
 [DEFAULT]
 tags = remote
 subsuite = remote
 prefs = remote.enabled=true
 support-files =
   chrome-remote-interface.js
-  doc_network_requestWillBeSent.html
-  file_network_requestWillBeSent.js
   head.js
 
 [browser_cdp.js]
 [browser_main_target.js]
-[browser_network_requestWillBeSent.js]
-[browser_page_bringToFront.js]
-[browser_page_captureScreenshot.js]
-[browser_page_frameNavigated.js]
-[browser_page_frameNavigated_iframe.js]
-[browser_page_javascriptDialog_alert.js]
-[browser_page_javascriptDialog_beforeunload.js]
-[browser_page_javascriptDialog_confirm.js]
-[browser_page_javascriptDialog_otherTarget.js]
-[browser_page_javascriptDialog_prompt.js]
-[browser_page_runtime_events.js]
-[browser_runtime_callFunctionOn.js]
-[browser_runtime_evaluate.js]
-[browser_runtime_executionContext.js]
-skip-if = os == "mac" || os == "win" # bug 1586503,1590930
-[browser_runtime_get_properties.js]
-[browser_runtime_remote_objects.js]
 [browser_session.js]
 [browser_tabs.js]
-[browser_target.js]
-[browser_target_browserContext.js]
-[browser_target_close.js]
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/network/browser.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  doc_requestWillBeSent.html
+  file_requestWillBeSent.js
+  head.js
+
+[browser_requestWillBeSent.js]
rename from remote/test/browser/browser_network_requestWillBeSent.js
rename to remote/test/browser/network/browser_requestWillBeSent.js
--- a/remote/test/browser/browser_network_requestWillBeSent.js
+++ b/remote/test/browser/network/browser_requestWillBeSent.js
@@ -1,19 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Test the Network.requestWillBeSent event
 
 const PAGE_URL =
-  "http://example.com/browser/remote/test/browser/doc_network_requestWillBeSent.html";
+  "http://example.com/browser/remote/test/browser/network/doc_requestWillBeSent.html";
 const JS_URL =
-  "http://example.com/browser/remote/test/browser/file_network_requestWillBeSent.js";
+  "http://example.com/browser/remote/test/browser/network/file_requestWillBeSent.js";
 
 add_task(async function(client) {
   const { Page, Network } = client;
 
   await Network.enable();
   ok(true, "Network domain has been enabled");
 
   let requests = 0;
rename from remote/test/browser/doc_network_requestWillBeSent.html
rename to remote/test/browser/network/doc_requestWillBeSent.html
--- a/remote/test/browser/doc_network_requestWillBeSent.html
+++ b/remote/test/browser/network/doc_requestWillBeSent.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title>Test page for requestWillBeSent</title>
 </head>
 <body>
-  <script type="text/javascript" src="file_network_requestWillBeSent.js"></script>
+  <script type="text/javascript" src="file_requestWillBeSent.js"></script>
 </body>
 </html>
rename from remote/test/browser/file_network_requestWillBeSent.js
rename to remote/test/browser/network/file_requestWillBeSent.js
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/network/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/page/browser.ini
@@ -0,0 +1,17 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  head.js
+
+[browser_bringToFront.js]
+[browser_captureScreenshot.js]
+[browser_frameNavigated.js]
+[browser_frameNavigated_iframe.js]
+[browser_javascriptDialog_alert.js]
+[browser_javascriptDialog_beforeunload.js]
+[browser_javascriptDialog_confirm.js]
+[browser_javascriptDialog_otherTarget.js]
+[browser_javascriptDialog_prompt.js]
+[browser_runtimeEvents.js]
rename from remote/test/browser/browser_page_bringToFront.js
rename to remote/test/browser/page/browser_bringToFront.js
rename from remote/test/browser/browser_page_captureScreenshot.js
rename to remote/test/browser/page/browser_captureScreenshot.js
rename from remote/test/browser/browser_page_frameNavigated.js
rename to remote/test/browser/page/browser_frameNavigated.js
rename from remote/test/browser/browser_page_frameNavigated_iframe.js
rename to remote/test/browser/page/browser_frameNavigated_iframe.js
rename from remote/test/browser/browser_page_javascriptDialog_alert.js
rename to remote/test/browser/page/browser_javascriptDialog_alert.js
rename from remote/test/browser/browser_page_javascriptDialog_beforeunload.js
rename to remote/test/browser/page/browser_javascriptDialog_beforeunload.js
rename from remote/test/browser/browser_page_javascriptDialog_confirm.js
rename to remote/test/browser/page/browser_javascriptDialog_confirm.js
rename from remote/test/browser/browser_page_javascriptDialog_otherTarget.js
rename to remote/test/browser/page/browser_javascriptDialog_otherTarget.js
rename from remote/test/browser/browser_page_javascriptDialog_prompt.js
rename to remote/test/browser/page/browser_javascriptDialog_prompt.js
rename from remote/test/browser/browser_page_runtime_events.js
rename to remote/test/browser/page/browser_runtimeEvents.js
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/page/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/runtime/browser.ini
@@ -0,0 +1,13 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  head.js
+
+[browser_callFunctionOn.js]
+[browser_evaluate.js]
+[browser_executionContext.js]
+skip-if = os == "mac" || os == "win" # bug 1586503,1590930
+[browser_getProperties.js]
+[browser_remoteObjects.js]
rename from remote/test/browser/browser_runtime_callFunctionOn.js
rename to remote/test/browser/runtime/browser_callFunctionOn.js
rename from remote/test/browser/browser_runtime_evaluate.js
rename to remote/test/browser/runtime/browser_evaluate.js
rename from remote/test/browser/browser_runtime_executionContext.js
rename to remote/test/browser/runtime/browser_executionContext.js
rename from remote/test/browser/browser_runtime_get_properties.js
rename to remote/test/browser/runtime/browser_getProperties.js
rename from remote/test/browser/browser_runtime_remote_objects.js
rename to remote/test/browser/runtime/browser_remoteObjects.js
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/runtime/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/target/browser.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+tags = remote
+subsuite = remote
+prefs = remote.enabled=true
+support-files =
+  head.js
+
+[browser_target.js]
+[browser_browserContext.js]
+[browser_closeTarget.js]
rename from remote/test/browser/browser_target_browserContext.js
rename to remote/test/browser/target/browser_browserContext.js
rename from remote/test/browser/browser_target_close.js
rename to remote/test/browser/target/browser_closeTarget.js
rename from remote/test/browser/browser_target.js
rename to remote/test/browser/target/browser_target.js
new file mode 100644
--- /dev/null
+++ b/remote/test/browser/target/head.js
@@ -0,0 +1,11 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* import-globals-from ../head.js */
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/remote/test/browser/head.js",
+  this
+);
--- a/remote/test/moz.build
+++ b/remote/test/moz.build
@@ -1,9 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"]
-BROWSER_CHROME_MANIFESTS += ["browser/browser.ini", "browser/input/browser.ini"]
+BROWSER_CHROME_MANIFESTS += [
+    "browser/browser.ini",
+    "browser/input/browser.ini",
+    "browser/network/browser.ini",
+    "browser/page/browser.ini",
+    "browser/runtime/browser.ini",
+    "browser/target/browser.ini",
+]
 
 with Files("puppeteer/test/**/*.spec.js"):
     IMPACTED_TESTS.flavors += ["puppeteer"]