aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2006-09-19 10:18:57 +0000
committerJörn Zaefferer <joern.zaefferer@gmail.com>2006-09-19 10:18:57 +0000
commitb5a33456e3feaafd50f41c201a714f9525e1d889 (patch)
treea0e697a06a8fb05148ac4f6e0dabc4dd8ec0ba0e
parentb0c3711d3e8bd844d1cfa8569864df1c1f73180a (diff)
downloadjquery-b5a33456e3feaafd50f41c201a714f9525e1d889.tar.gz
jquery-b5a33456e3feaafd50f41c201a714f9525e1d889.zip
Clear timeout (prevents freezing of test suite when async tests fail) when start is called
-rw-r--r--build/test/data/testrunner.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
index a72a1c17c..db97215be 100644
--- a/build/test/data/testrunner.js
+++ b/build/test/data/testrunner.js
@@ -8,6 +8,7 @@ var stats = {
};
var queue = [];
var blocking = false;
+var timeout;
function synchronize(callback) {
queue[queue.length] = callback;
@@ -26,9 +27,11 @@ function process() {
function stop() {
blocking = true;
- setTimeout(start, asyncTimeout * 1000);
+ timeout = setTimeout(start, asyncTimeout * 1000);
}
function start() {
+ if(timeout)
+ clearTimeout(timeout);
blocking = false;
process();
}