Skip to content

Running all tests in a suite before reporting #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evanworley wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Running all tests in a suite before reporting #156

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c87562
Changing runParallel behavior to run all the tests in the suite, even…
evanworley Dec 7, 2011
8453e63
Updating runSerial to also run all tests in the suite before reporting
evanworley Dec 7, 2011
fbd3e86
Only calling test.callback() in assertResponse if it has a callback m…
evanworley Dec 7, 2011
0f558d9
Adding onResponse handler to properly decrement server.__pending to a…
Dec 13, 2011
d3cfcfd
Fixing use of wrong assert
Dec 13, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions bin/expresso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ assert.length = function(val, n, msg) {
* @param {String} msg
*/
assert.response = function(server, req, res, msg) {
var test = assert._test;
var test = this._test;

// Callback as third or fourth arg
var callback = typeof res === 'function'
Expand Down Expand Up @@ -453,7 +453,7 @@ assert.response = function(server, req, res, msg) {
headers: req.headers
});

var check = function() {
var onResponse = function() {
if (--server.__pending === 0) {
server.close();
server.__listening = false;
Expand All @@ -463,7 +463,7 @@ assert.response = function(server, req, res, msg) {
// Timeout
if (requestTimeout) {
timer = setTimeout(function() {
check();
onResponse();
delete req.timeout;
test.failure(new Error(msg + 'Request timed out after ' + requestTimeout + 'ms.'));
}, requestTimeout);
Expand All @@ -476,6 +476,8 @@ assert.response = function(server, req, res, msg) {
response.setEncoding(encoding);
response.on('data', function(chunk) { response.body += chunk; });
response.on('end', function() {
onResponse();

if (timer) clearTimeout(timer);
try {
// Assert response body
Expand Down Expand Up @@ -528,7 +530,11 @@ assert.response = function(server, req, res, msg) {
test.success(msg);
} catch (err) {
test.failure(err);
test.callback();

// Tests only have callbacks when there is more than one test
if (typeof test.callback === "function") {
test.callback();
}
} finally {
// Remove our token.
var idx = test._pending.indexOf(token);
Expand All @@ -538,9 +544,6 @@ assert.response = function(server, req, res, msg) {
// Someone else took our token. This is an error.
test.failure(new Error('Request succeeded, but token vanished: ' + msg));
}

// Potentially shut down the server.
check();
}
});
});
Expand Down Expand Up @@ -937,7 +940,11 @@ Test.prototype.runSerial = function(callback) {
if (++dots % 25 === 0) console.log();
test.setup(function() {
if (test.fn.length < 1) {
test.fn();
try {
test.fn();
} catch (err) {
test.failure(err);
}
test.teardown(callback);
} else {
var id = setTimeout(function() {
Expand All @@ -950,18 +957,27 @@ Test.prototype.runSerial = function(callback) {
test.report();
});
};
test.fn(test.callback);

try {
test.fn(test.callback);
} catch (err) {
test.failure(err);
}
}
});
};

Test.prototype.runParallel = function() {
var test = this;
test.fn(function(fn) {
test.on('exit', function() {
fn(test.assert);
});
}, test.assert);
try {
test.fn(function(fn) {
test.on('exit', function() {
fn(test.assert);
});
}, test.assert);
} catch (err) {
test.failure(err);
}
};

/**
Expand Down