bump up timeout for tests against AWS from 5s to 15s

This commit is contained in:
Ricky Ng-Adam 2014-04-25 13:45:34 +08:00
parent 4c8f489956
commit 1345516117
3 changed files with 27 additions and 20 deletions

View File

@ -22,8 +22,10 @@ var config = {
ssl: true
};
test('uses password file when PGPASSFILE env variable is set', function() {
// connect & disconnect from heroku
pg.connect(config, assert.success(function(client, done) {
pg.connect(config, assert.calls(function(err, client, done) {
assert.isNull(err);
client.query('SELECT NOW() as time', assert.success(function(res) {
assert(res.rows[0].time.getTime());
@ -33,4 +35,5 @@ pg.connect(config, assert.success(function(client, done) {
done();
pg.end();
}))
}));
}, 15000));
});

View File

@ -15,11 +15,14 @@ var config = {
ssl: true
};
test('connection with config ssl = true', function() {
//connect & disconnect from heroku
pg.connect(config, assert.success(function(client, done) {
pg.connect(config, assert.calls(function(err, client, done) {
assert.isNull(err);
client.query('SELECT NOW() as time', assert.success(function(res) {
assert(res.rows[0].time.getTime());
done();
pg.end();
}))
}));
}, 15000));
});

View File

@ -133,9 +133,10 @@ assert.lengthIs = function(actual, expectedLength) {
var expect = function(callback, timeout) {
var executed = false;
timeout = timeout || 5000;
var id = setTimeout(function() {
assert.ok(executed, "Expected execution of function to be fired");
}, timeout || 5000)
assert.ok(executed, "Expected execution of function to be fired within " + timeout + ' milliseconds');
}, timeout)
if(callback.length < 3) {
return function(err, queryResult) {