made timeout lenght of assert.calls configurable and made tests die

sooner on error
This commit is contained in:
Brian Carlson 2010-12-09 20:50:19 -06:00
parent 169c6dc3ce
commit 10a244ae4c

View File

@ -82,11 +82,11 @@ assert.length = function(actual, expectedLength) {
assert.equal(actual.length, expectedLength);
};
var expect = function(callback) {
var expect = function(callback, timeout) {
var executed = false;
var id = setTimeout(function() {
assert.ok(executed, "Expected execution of " + callback + " fired");
}, 1000)
}, timeout || 1000)
return function(err, queryResult) {
clearTimeout(id);
@ -105,18 +105,13 @@ assert.calls = expect;
});
test = function(name, action) {
try{
test.testCount ++;
var result = action();
if(result === false) {
test.ignored.push(name);
process.stdout.write('?');
}else{
process.stdout.write('.');
}
}catch(e) {
process.stdout.write('E');
test.errors.push({name: name, e: e});
test.testCount ++;
var result = action();
if(result === false) {
test.ignored.push(name);
process.stdout.write('?');
}else{
process.stdout.write('.');
}
};