Changeset 156678 in webkit

Timestamp:

Sep 30, 2013, 1:47:43 PM (11 years ago)

Author:

ap@apple.com

Message:

Remove timeout from shouldBecome* functions in js-test-pre
​https://bugs.webkit.org/show_bug.cgi?id=122121

Reviewed by Ryosuke Niwa.

Removed timeout. A 0.5 sec timeout never makes sense, and if something is stuck,
a test should just time out normally.

• resources/js-test-pre.js:

(_waitForCondition):
(shouldBecomeEqual):
(shouldBecomeEqualToString):
(shouldBecomeDifferent):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• resources/js-test-pre.js (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-30  Alexey Proskuryakov  <ap@apple.com>
+
+        Remove timeout from shouldBecome* functions in js-test-pre
+        https://bugs.webkit.org/show_bug.cgi?id=122121
+
+        Reviewed by Ryosuke Niwa.
+
+        Removed timeout. A 0.5 sec timeout never makes sense, and if something is stuck,
+        a test should just time out normally.
+
+        * resources/js-test-pre.js:
+        (_waitForCondition):
+        (shouldBecomeEqual):
+        (shouldBecomeEqualToString):
+        (shouldBecomeDifferent):
+
 2013-09-30  Jer Noble  <jer.noble@apple.com>
 

trunk/LayoutTests/resources/js-test-pre.js

@@ -265 +265 @@
 }
 
-// Execute condition every 5 milliseconds until it succeed or failureTime is reached.
-// completionHandler is executed on success, failureHandler is executed on timeout.
-function _waitForCondition(condition, failureTime, completionHandler, failureHandler)
-{
-  if (condition()) {
+// Execute condition every 5 milliseconds until it succeeds.
+function _waitForCondition(condition, completionHandler)
+{
+  if (condition())
     completionHandler();
-  } else if (Date.now() > failureTime) {
-    failureHandler();
-  } else {
-    setTimeout(_waitForCondition, 5, condition, failureTime, completionHandler, failureHandler);
-  }
-}
-
-function shouldBecomeEqual(_a, _b, completionHandler, timeout)
+  else
+    setTimeout(_waitForCondition, 5, condition, completionHandler);
+}
+
+function shouldBecomeEqual(_a, _b, completionHandler)
 {
   if (typeof _a != "string" || typeof _b != "string")
     debug("WARN: shouldBecomeEqual() expects string arguments");
-
-  if (timeout === undefined)
-    timeout = 500;
 
   var condition = function() {
@@ -303 +296 @@
     return false;
   };
-  var failureTime = Date.now() + timeout;
-  var failureHandler = function () {
-    testFailed(_a + " failed to change to " + _b + " in " + (timeout / 1000) + " seconds.");
-    completionHandler();
-  };
-  _waitForCondition(condition, failureTime, completionHandler, failureHandler);
-}
-
-function shouldBecomeEqualToString(value, reference, completionHandler, timeout)
+  _waitForCondition(condition, completionHandler);
+}
+
+function shouldBecomeEqualToString(value, reference, completionHandler)
 {
   if (typeof value !== "string" || typeof reference !== "string")
     debug("WARN: shouldBecomeEqualToString() expects string arguments");
   var unevaledString = JSON.stringify(reference);
-  shouldBecomeEqual(value, unevaledString, completionHandler, timeout);
+  shouldBecomeEqual(value, unevaledString, completionHandler);
 }
 
@@ -398 +386 @@
 }
 
-function shouldBecomeDifferent(_a, _b, completionHandler, timeout)
+function shouldBecomeDifferent(_a, _b, completionHandler)
 {
   if (typeof _a != "string" || typeof _b != "string")
     debug("WARN: shouldBecomeDifferent() expects string arguments");
-  if (timeout === undefined)
-    timeout = 500;
 
   var condition = function() {
@@ -422 +408 @@
     return false;
   };
-  var failureTime = Date.now() + timeout;
-  var failureHandler = function () {
-    testFailed(_a + " did not become different from " + _b + " in " + (timeout / 1000) + " seconds.");
-    completionHandler();
-  };
-  _waitForCondition(condition, failureTime, completionHandler, failureHandler);
+  _waitForCondition(condition, completionHandler);
 }