cartodb/node-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/integration/client/heroku-pgpass-tests.js
View File

@ -22,15 +22,18 @@ var config = {
ssl: true
};
// connect & disconnect from heroku
pg.connect(config, assert.success(function(client, done) {
client.query('SELECT NOW() as time', assert.success(function(res) {
assert(res.rows[0].time.getTime());
test('uses password file when PGPASSFILE env variable is set', function() {
// connect & disconnect from heroku
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());
// cleanup ... remove the env variable
delete process.env.PGPASSFILE;
// cleanup ... remove the env variable
delete process.env.PGPASSFILE;
done();
pg.end();
}))
}));
done();
pg.end();
}))
}, 15000));
});

19
test/integration/client/heroku-ssl-tests.js
View File

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

5
test/test-helper.js
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) {