Bug 803933 - Intermittent browser_dbg_reload-same-script.js | Timed out while polling for the scripts. followed by 10,933 other failures, r=past
authorVictor Porof <vporof@mozilla.com>
Fri, 26 Oct 2012 23:28:54 +0300
changeset 111639 926a3d0784bc426bd5ad08b40b092e2fb52eb76f
parent 111638 3380c067c0c6d7cd886fb4087c992db0a9559958
child 111640 293e0f58187d2139da23faf2e4b28e4cf217acbe
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewerspast
bugs803933
milestone19.0a1
Bug 803933 - Intermittent browser_dbg_reload-same-script.js | Timed out while polling for the scripts. followed by 10,933 other failures, r=past
browser/devtools/debugger/test/browser_dbg_propertyview-08.js
browser/devtools/debugger/test/browser_dbg_reload-same-script.js
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
@@ -81,20 +81,21 @@ function testFrameParameters()
       argumentsNode.expand();
       cNode.expand();
 
       // Poll every few milliseconds until the properties are retrieved.
       // It's important to set the timer in the chrome window, because the
       // content window timers are disabled while the debuggee is paused.
       let count = 0;
       let intervalID = window.setInterval(function(){
-        dump("count: "+count+" ");
+        info("count: " + count + " ");
         if (++count > 50) {
           ok(false, "Timed out while polling for the properties.");
-          resumeAndFinish();
+          window.clearInterval(intervalID);
+          return resumeAndFinish();
         }
         if (!thisNode.fetched ||
             !argumentsNode.fetched ||
             !cNode.fetched) {
           return;
         }
         window.clearInterval(intervalID);
         is(thisNode.target.querySelector(".property > .title > .name")
--- a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
+++ b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
@@ -173,20 +173,21 @@ function test()
       "The shown script is not the the correct one. (" + step + ")");
   }
 
   function performAction(callback, data)
   {
     // Poll every few milliseconds until the scripts are retrieved.
     let count = 0;
     let intervalID = window.setInterval(function() {
-      dump("count: " + count + " ");
+      info("count: " + count + " ");
       if (++count > 50) {
         ok(false, "Timed out while polling for the scripts.");
-        closeDebuggerAndFinish();
+        window.clearInterval(intervalID);
+        return closeDebuggerAndFinish();
       }
       if (gView.Sources.values.length !== 2) {
         return;
       }
       info("Available scripts: " + gView.Sources.values);
 
       // We got all the scripts, it's safe to callback.
       window.clearInterval(intervalID);