Revert "[Finishes #45476285] Add timeout support to async tests"

This reverts commit 8f5d0beb8c.

Async timeout support is just not ready for prime time.
This commit is contained in:
Colin O'Byrne and JR Boyens
2013-07-24 14:38:57 -07:00
parent 8f5d0beb8c
commit 051f3499ec
6 changed files with 8 additions and 95 deletions

View File

@@ -6,11 +6,6 @@ getJasmineRequireObj().QueueRunner = function() {
this.clearStack = attrs.clearStack || function(fn) {fn();};
this.onException = attrs.onException || function() {};
this.catchException = attrs.catchException || function() { return true; };
this.timer = attrs.realTimer;
this.asyncSpecTimeout = attrs.asyncSpecTimeout || 60000;
this.leaf = attrs.leaf || false;
}
QueueRunner.prototype.execute = function() {
@@ -21,23 +16,16 @@ getJasmineRequireObj().QueueRunner = function() {
var length = fns.length,
self = this,
iterativeIndex;
var nextIteration = function(currentIteration) {
return function() {
self.run(fns, currentIteration + 1);
};
};
for(iterativeIndex = recursiveIndex; iterativeIndex < length; iterativeIndex++) {
var fn = fns[iterativeIndex];
if (fn.length > 0) {
var attemptSuccessful = attempt(fn, nextIteration(iterativeIndex));
var attemptSuccessful = attempt(function() {
fn.call(self, function() { self.run(fns, iterativeIndex + 1); });
});
if(attemptSuccessful) {
return;
} else {
// TODO cleanup the timeout ?
}
} else {
attempt(function() { fn.call(self); });
@@ -50,24 +38,9 @@ getJasmineRequireObj().QueueRunner = function() {
this.clearStack(this.onComplete);
}
function attempt(fn, done) {
var timeout;
function attempt(fn) {
try {
if (self.leaf) {
timeout = self.timer.setTimeout(function() {
self.onException(new Error("timeout"));
done();
}, self.asyncSpecTimeout);
}
var next = function() {
if (self.leaf) { self.timer.clearTimeout(timeout); }
done();
};
fn.call(self, next);
fn();
return true;
} catch (e) {
self.onException(e);