Backed out changeset 91ba81f7207e (bug 1030318) for making browser_profiler_tree-abstract-02.js failing permanent on e10s
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 21 Jan 2016 12:15:27 +0100
changeset 317922 b2e729decd54914536ed5ce29cf9a201d2f0eb45
parent 317921 1292ce950e07d6d0f2a2cb16c6dda930ed176668
child 317923 c0a8a74faf03199043c5dcaf16103b88bc4a283e
push id1079
push userjlund@mozilla.com
push dateFri, 15 Apr 2016 21:02:33 +0000
treeherdermozilla-release@575fbf6786d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1030318
milestone46.0a1
backs out91ba81f7207e597a5fca3b7550cdebf852e3e9a1
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
Backed out changeset 91ba81f7207e (bug 1030318) for making browser_profiler_tree-abstract-02.js failing permanent on e10s
devtools/client/framework/test/browser.ini
devtools/client/framework/test/browser_toolbox_options_disable_js.js
devtools/client/framework/test/helper_disable_cache.js
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -23,29 +23,32 @@ support-files =
 [browser_keybindings_01.js]
 [browser_keybindings_02.js]
 [browser_keybindings_03.js]
 [browser_new_activation_workflow.js]
 [browser_target_events.js]
 [browser_target_remote.js]
 [browser_target_support.js]
 [browser_two_tabs.js]
-skip-if = e10s && debug && os == 'win' # Bug 1231869
+skip-if = e10s && debug && os == 'win'
 [browser_toolbox_dynamic_registration.js]
 [browser_toolbox_getpanelwhenready.js]
 [browser_toolbox_highlight.js]
 [browser_toolbox_hosts.js]
 [browser_toolbox_hosts_size.js]
 [browser_toolbox_minimize.js]
 skip-if = true # Bug 1177463 - Temporarily hide the minimize button
 [browser_toolbox_options.js]
 [browser_toolbox_options_disable_buttons.js]
 [browser_toolbox_options_disable_cache-01.js]
+skip-if = e10s # Bug 1030318
 [browser_toolbox_options_disable_cache-02.js]
+skip-if = e10s # Bug 1030318
 [browser_toolbox_options_disable_js.js]
+skip-if = e10s # Bug 1030318
 # [browser_toolbox_raise.js] # Bug 962258
 # skip-if = os == "win"
 [browser_toolbox_ready.js]
 [browser_toolbox_select_event.js]
 skip-if = e10s # Bug 1069044 - destroyInspector may hang during shutdown
 [browser_toolbox_sidebar.js]
 [browser_toolbox_sidebar_events.js]
 [browser_toolbox_sidebar_existing_tabs.js]
--- a/devtools/client/framework/test/browser_toolbox_options_disable_js.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_js.js
@@ -52,31 +52,39 @@ function testJSEnabledIframe(secondPass)
                           'Output is "JavaScript Enabled" in iframe');
   if (secondPass) {
     finishUp();
   } else {
     toggleJS().then(testJSDisabled);
   }
 }
 
-let toggleJS = Task.async(function*() {
+function toggleJS() {
+  let deferred = promise.defer();
   let panel = toolbox.getCurrentPanel();
   let cbx = panel.panelDoc.getElementById("devtools-disable-javascript");
 
+  cbx.scrollIntoView();
+
   if (cbx.checked) {
     info("Clearing checkbox to re-enable JS");
   } else {
     info("Checking checkbox to disable JS");
   }
 
-  let browserLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    doc = content.document;
+    deferred.resolve();
+  }, true);
+
   cbx.click();
-  yield browserLoaded;
-  doc = content.document;
-});
+
+  return deferred.promise;
+}
 
 function testJSDisabled() {
   info("Testing that JS is disabled");
 
   let output = doc.getElementById("output");
   doc.querySelector("#logJSDisabled").click();
 
   ok(output.textContent !== "JavaScript Disabled",
--- a/devtools/client/framework/test/helper_disable_cache.js
+++ b/devtools/client/framework/test/helper_disable_cache.js
@@ -66,19 +66,24 @@ function* checkCacheEnabled(tabX, expect
 }
 
 function* setDisableCacheCheckboxChecked(tabX, state) {
   gBrowser.selectedTab = tabX.tab;
 
   let panel = tabX.toolbox.getCurrentPanel();
   let cbx = panel.panelDoc.getElementById("devtools-disable-cache");
 
+  cbx.scrollIntoView();
+
+  // After uising scrollIntoView() we need to wait for the browser to scroll.
+  yield waitForTick();
+
   if (cbx.checked !== state) {
     info("Setting disable cache checkbox to " + state + " for " + tabX.title);
-    cbx.click();
+    EventUtils.synthesizeMouseAtCenter(cbx, {}, panel.panelWin);
 
     // We need to wait for all checkboxes to be updated and the docshells to
     // apply the new cache settings.
     yield waitForTick();
   }
 }
 
 function reloadTab(tabX) {