KristianRosenvold: Fixed transient instabilities in firefox driver

The crooked timer strikes back r16079
kuahyeow · Mar 1, 2012 · 39aa37c · 39aa37c
1 parent 47258f1
commit 39aa37c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/java/CHANGELOG b/java/CHANGELOG
@@ -1,4 +1,16 @@
-v2.20.0 (In progress)
+v2.21.0 (In Progress)
+=======
+
+WebDriver:
+  * Significant stability improvements in firefoxdriver.
+
+Grid:
+  * Content length issue solved
+  * Improvements in thread dumps in both hub and node,
+    possible to corrolate the two.
+
+
+v2.20.0 
 =======
 
 WebDriver:

diff --git a/javascript/firefox-driver/js/modals.js b/javascript/firefox-driver/js/modals.js
@@ -30,8 +30,8 @@ goog.require('fxdriver.utils');
 
 
 fxdriver.modals.isModalPresent = function(callback, timeout) {
-  var timer = new fxdriver.Timer();
-  timer.runWhenTrue(
+    fxdriver.modals.timer = new fxdriver.Timer();
+    fxdriver.modals.timer.runWhenTrue(
     function() {
       var modal = fxdriver.modals.find_();
       return modal && modal.document;

diff --git a/javascript/firefox-driver/js/nsCommandProcessor.js b/javascript/firefox-driver/js/nsCommandProcessor.js
@@ -281,7 +281,7 @@ DelayedCommand.prototype.executeInternal_ = function() {
       this.driver_.response_ = this.response_;
 
       var response = this.response_;
-      var timer = new fxdriver.Timer();
+      DelayedCommand.prototype.executeInternal_.nstimer = new fxdriver.Timer();
       var startTime = new Date().getTime();
       var endTime = startTime + this.response_.session.getImplicitWait();
       var name = this.command_.name;
@@ -301,7 +301,7 @@ DelayedCommand.prototype.executeInternal_ = function() {
           func();
         } catch (e) {
           if (new Date().getTime() < endTime) {
-            timer.setTimeout(toExecute, 100);
+              DelayedCommand.prototype.executeInternal_.nstimer.setTimeout(toExecute, 100);
           } else {
             if (!e.isWebDriverError) {
               fxdriver.Logger.dumpn(