From 7f4351293c713d4c83ad417e1da4c5fb53f2054e Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 18 Mar 2014 10:05:55 +0100 Subject: [PATCH] Do not assume PGPORT env variable is unset during testing --- test/unit/client/configuration-tests.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/unit/client/configuration-tests.js b/test/unit/client/configuration-tests.js index 219ad5cd5..4e3724ca8 100644 --- a/test/unit/client/configuration-tests.js +++ b/test/unit/client/configuration-tests.js @@ -1,12 +1,16 @@ require(__dirname+'/test-helper'); +var pguser = process.env['PGUSER'] || process.env.USER; +var pgdatabase = process.env['PGDATABASE'] || process.env.USER; +var pgport = process.env['PGPORT'] || 5432; + test('client settings', function() { test('defaults', function() { var client = new Client(); - assert.equal(client.user, process.env['PGUSER'] || process.env.USER); - assert.equal(client.database, process.env['PGDATABASE'] || process.env.USER); - assert.equal(client.port, 5432); + assert.equal(client.user, pguser); + assert.equal(client.database, pgdatabase); + assert.equal(client.port, pgport); }); test('custom', function() { @@ -69,7 +73,7 @@ test('calls connect correctly on connection', function() { usedHost = host; }; client.connect(); - assert.equal(usedPort, "/tmp/.s.PGSQL.5432"); + assert.equal(usedPort, "/tmp/.s.PGSQL." + pgport); assert.strictEqual(usedHost, undefined) })