Merge pull request #1094 from mickhansen/postgres-local-testfix

Make tests work on my local machine ;)

test/associations/has-many.test.js

@@ -409,7 +409,9 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
 
 
       Task.hasMany(User)
       Task.hasMany(User)
       expect(Task.attributes.UserId).not.to.exist
       expect(Task.attributes.UserId).not.to.exist
-      done()
+      setTimeout(function () {
+        done()
+      }, 50)
     })
     })
 
 
     describe('setAssociations', function() {
     describe('setAssociations', function() {

test/postgres/associations.test.js

@@ -30,7 +30,10 @@ if (dialect.match(/^postgres/)) {
 
 
           Table1.hasMany(Table2, {joinTableName: 'table1_to_table2'})
           Table1.hasMany(Table2, {joinTableName: 'table1_to_table2'})
           Table2.hasMany(Table1, {joinTableName: 'table1_to_table2'})
           Table2.hasMany(Table1, {joinTableName: 'table1_to_table2'})
-          done()
+
+          setTimeout(function () {
+            done()
+          }, 50)
         })
         })
 
 
         it("should not use a combined name", function(done) {
         it("should not use a combined name", function(done) {

test/sequelize.test.js

 var chai      = require('chai')
 var chai      = require('chai')
   , expect    = chai.expect
   , expect    = chai.expect
+  , assert    = chai.assert
   , Support   = require(__dirname + '/support')
   , Support   = require(__dirname + '/support')
   , DataTypes = require(__dirname + "/../lib/data-types")
   , DataTypes = require(__dirname + "/../lib/data-types")
   , dialect   = Support.getTestDialect()
   , dialect   = Support.getTestDialect()
@@ -373,7 +374,10 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
 
 
       User2.sync().error(function(err) {
       User2.sync().error(function(err) {
         if (dialect === "postgres" || dialect === "postgres-native") {
         if (dialect === "postgres" || dialect === "postgres-native") {
-          expect(err.message).to.equal('role "bar" does not exist')
+          assert([
+            'role "bar" does not exist',
+            'password authentication failed for user "bar"'
+          ].indexOf(err.message) !== -1)
         } else {
         } else {
           expect(err.message.toString()).to.match(/.*Access\ denied.*/)
           expect(err.message.toString()).to.match(/.*Access\ denied.*/)
         }
         }