Backed out changeset 5cd2ba3bc6c4 (bug 1336389) for failing new talos…

… test cpstartup. r=backout
iaxat · Sep 19, 2017 · 39e85a0 · 39e85a0
1 parent 174ffbe
commit 39e85a0
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 239 deletions.
diff --git a/testing/moz.build b/testing/moz.build
@@ -46,9 +46,6 @@ with Files("talos/talos/tests/scroll/**"):
 with Files("talos/talos/tests/tabpaint/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
-with Files("talos/talos/tests/cpstartup/**"):
-    BUG_COMPONENT = ("Firefox", "Tabbed Browser")
-
 with Files("talos/talos/tests/tart/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
@@ -15,11 +15,11 @@
             "tests": ["dromaeo_css", "kraken"]
         },
         "other-e10s": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint", "cpstartup"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
         },
         "other-stylo-disabled-e10s": {
             "talos_options": ["--disable-stylo"],
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint", "cpstartup"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
         },
         "g1-e10s": {
             "tests": ["tp5o_scroll", "glterrain"],

diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
@@ -304,28 +304,6 @@ class tabpaint(PageloaderTest):
     }
 
 
-@register_test()
-class cpstartup(PageloaderTest):
-    """
-
-    """
-    extensions = '${talos}/tests/cpstartup/cpstartup-signed.xpi'
-    tpmanifest = '${talos}/tests/cpstartup/cpstartup.manifest'
-    tppagecycles = 20
-    gecko_profile_entries = 1000000
-    tploadnocache = True
-    unit = 'ms'
-    preferences = {
-        # By default, Talos is configured to open links from
-        # content in new windows. We're overriding them so that
-        # they open in new tabs instead.
-        # See http://kb.mozillazine.org/Browser.link.open_newwindow
-        # and http://kb.mozillazine.org/Browser.link.open_newwindow.restriction
-        'browser.link.open_newwindow': 3,
-        'browser.link.open_newwindow.restriction': 2,
-    }
-
-
 @register_test()
 class tps(PageloaderTest):
     """

diff --git a/testing/talos/talos/tests/cpstartup/bootstrap.js b/testing/talos/talos/tests/cpstartup/bootstrap.js
diff --git a/testing/talos/talos/tests/cpstartup/chrome.manifest b/testing/talos/talos/tests/cpstartup/chrome.manifest
diff --git a/testing/talos/talos/tests/cpstartup/content/cpstartup.html b/testing/talos/talos/tests/cpstartup/content/cpstartup.html
diff --git a/testing/talos/talos/tests/cpstartup/content/target.html b/testing/talos/talos/tests/cpstartup/content/target.html
diff --git a/testing/talos/talos/tests/cpstartup/cpstartup-signed.xpi b/testing/talos/talos/tests/cpstartup/cpstartup-signed.xpi
diff --git a/testing/talos/talos/tests/cpstartup/cpstartup.manifest b/testing/talos/talos/tests/cpstartup/cpstartup.manifest
diff --git a/testing/talos/talos/tests/cpstartup/install.rdf b/testing/talos/talos/tests/cpstartup/install.rdf
diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js
@@ -257,8 +257,6 @@ var WebNavigation =  {
     addMessageListener("WebNavigation:SetOriginAttributes", this);
     addMessageListener("WebNavigation:Reload", this);
     addMessageListener("WebNavigation:Stop", this);
-    // This message is used for measuring content process startup performance.
-    sendAsyncMessage("Content:BrowserChildReady", { time: Services.telemetry.msSystemNow() });
   },
 
   get webNavigation() {