Bug 966424 - Intermittent browser_bug765105_background_image_tooltip.js - Remove the timeout; r=miker

browser/devtools/styleinspector/test/head.js

@@ -6,8 +6,8 @@
 const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/styleinspector/test/";
 const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/styleinspector/test/";
 
-//Services.prefs.setBoolPref("devtools.dump.emit", true);
+// Services.prefs.setBoolPref("devtools.dump.emit", true);
-Services.prefs.setBoolPref("devtools.debugger.log", true);
+// Services.prefs.setBoolPref("devtools.debugger.log", true);
 
 let tempScope = {};
 
@@ -31,7 +31,7 @@ SimpleTest.registerCleanupFunction(() => {
 });
 
 SimpleTest.registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("devtools.debugger.log");
+  // Services.prefs.clearUserPref("devtools.debugger.log");
   Services.prefs.clearUserPref("devtools.dump.emit");
 });
 
@@ -74,7 +74,7 @@ function openView(name, callback)
       callback(inspector, view);
     }
 
-    if (inspector.sidebar.getTab(name)) {
+    if (inspector.sidebar.getWindowForTab(name)) {
       onReady();
     } else {
       inspector.sidebar.once(name + "-ready", onReady);

toolkit/devtools/server/actors/inspector.js

@@ -105,6 +105,8 @@ HELPER_SHEET += ":-moz-devtools-highlighted { outline: 2px dashed #F06!important
 
 Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm");
 
+loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
+
 loader.lazyGetter(this, "DOMParser", function() {
   return Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser);
 });
@@ -2602,10 +2604,12 @@ var InspectorActor = protocol.ActorClass({
     }
 
     // If the request hangs for too long, kill it to avoid queuing up other requests
-    // to the same actor
+    // to the same actor, except if we're running tests
-    this.window.setTimeout(() => {
+    if (!gDevTools.testing) {
-      deferred.reject(new Error("Image " + url + " could not be retrieved in time"));
+      this.window.setTimeout(() => {
-    }, IMAGE_FETCHING_TIMEOUT);
+        deferred.reject(new Error("Image " + url + " could not be retrieved in time"));
+      }, IMAGE_FETCHING_TIMEOUT);
+    }
 
     img.src = url;