resolve cherry-pick conflict

Author: Fonger

.travis.yml

@@ -15,7 +15,9 @@ before_script:
   - tar -zxvf mongodb-linux-x86_64-2.6.11.tgz
   - mkdir -p ./data/db/27017
   - mkdir -p ./data/db/27000
-  - ./mongodb-linux-x86_64-2.6.11/bin/mongod --fork --nopreallocj --dbpath ./data/db/27017 --syslog --port 27017
+  - printf "\n--timeout 8000" >> ./test/mocha.opts
+  - ./mongodb-linux-x86_64-2.6.11/bin/mongod --fork --dbpath ./data/db/27017 --syslog --port 27017
+  - sleep 3
 script:
   - npm test
   - npm run lint

test/connection.test.js

@@ -18,6 +18,7 @@ var Schema = mongoose.Schema;
  */
 
 describe('connections:', function() {
+  this.timeout(10000);
   describe('useMongoClient/openUri (gh-5304)', function() {
     it('with mongoose.connect()', function(done) {
       var conn = mongoose.connect('mongodb://localhost:27017/mongoosetest', {
@@ -1082,7 +1083,7 @@ describe('connections:', function() {
 
   describe('errors', function() {
     it('event fires with one listener', function(done) {
-      this.timeout(1000);
+      this.timeout(1500);
       var db = start({uri: 'mongodb://whatever23939.localhost/fakeeee?connectTimeoutMS=500', noErrorListener: 1});
       db.on('error', function() {
         // this callback has no params which triggered the bug #759

test/document.test.js

@@ -1376,6 +1376,8 @@ describe('document', function() {
     });
 
     it('validator should run only once per sub-doc gh-1743', function(done) {
+      this.timeout(process.env.TRAVIS ? 8000 : 4500);
+
       var count = 0;
       var db = start();
 
@@ -1410,18 +1412,21 @@ describe('document', function() {
 
 
     it('validator should run in parallel', function(done) {
-      // we set the time out to be double that of the validator - 1 (so that running in serial will be greater than that)
-      this.timeout(1000);
       var db = start();
       var count = 0;
+      var startTime, endTime;
 
       var SchemaWithValidator = new Schema({
         preference: {
           type: String,
           required: true,
-          validate: function validator(value, done) {
-            count++;
-            setTimeout(done.bind(null, true), 500);
+          validate: {
+            validator: function validator(value, done) {
+              count++;
+              if (count === 1) startTime = Date.now();
+              else if (count === 4) endTime = Date.now();
+              setTimeout(done.bind(null, true), 150);
+            }
           }
         }
       });
@@ -1442,6 +1447,7 @@ describe('document', function() {
       m.save(function(err) {
         assert.ifError(err);
         assert.equal(count, 4);
+        assert(endTime - startTime < 150 * 4); // serial >= 150 * 4, parallel < 150 * 4
         db.close(done);
       });
     });

test/gh-1408.test.js

@@ -10,6 +10,8 @@ var start = require('./common'),
 
 describe('documents should not be converted to _id (gh-1408)', function() {
   it('if an embedded doc', function(done) {
+    this.timeout(process.env.TRAVIS ? 8000 : 4500);
+
     var db = start();
 
     var PreferenceSchema = new Schema({

test/index.test.js

@@ -107,6 +107,8 @@ describe('mongoose module:', function() {
   });
 
   describe('disconnection of all connections', function() {
+    this.timeout(10000);
+
     describe('no callback', function() {
       it('works', function(done) {
         var mong = new Mongoose(),

test/model.aggregate.test.js

@@ -23,6 +23,8 @@ var collection = 'aggregate_' + random();
 mongoose.model('Aggregate', userSchema);
 
 describe('model aggregate', function() {
+  this.timeout(process.env.TRAVIS ? 8000 : 4500);
+
   var group = {$group: {_id: null, maxAge: {$max: '$age'}}};
   var project = {$project: {maxAge: 1, _id: 0}};
   var db, A, maxAge;
@@ -74,8 +76,6 @@ describe('model aggregate', function() {
     });
 
     it('when return promise', function(done) {
-      this.timeout(4000);
-
       A.aggregate(group, project).then( function(res) {
         assert.ok(res);
         assert.equal(1, res.length);
@@ -86,8 +86,6 @@ describe('model aggregate', function() {
     });
 
     it('with arrays', function(done) {
-      this.timeout(4000);
-
       A.aggregate([group, project], function(err, res) {
         assert.ifError(err);
         assert.ok(res);
@@ -99,8 +97,6 @@ describe('model aggregate', function() {
     });
 
     it('with Aggregate syntax', function(done) {
-      this.timeout(4000);
-
       var promise = A.aggregate()
         .group(group.$group)
         .project(project.$project)
@@ -116,8 +112,6 @@ describe('model aggregate', function() {
     });
 
     it('with Aggregate syntax if callback not provided', function(done) {
-      this.timeout(4000);
-
       var promise = A.aggregate()
         .group(group.$group)
         .project(project.$project)
@@ -143,8 +137,6 @@ describe('model aggregate', function() {
         return done();
       }
 
-      this.timeout(4000);
-
       var outputCollection = 'aggregate_output_' + random();
       A.aggregate()
         .group(group.$group)

test/model.create.test.js

@@ -99,21 +99,23 @@ describe('model', function() {
     });
 
     it('creates in parallel', function(done) {
-      // we set the time out to be double that of the validator - 1 (so that running in serial will be greater than that)
-      this.timeout(1000);
       var db = start(),
           countPre = 0,
           countPost = 0;
 
       var SchemaWithPreSaveHook = new Schema({
         preference: String
       });
+
+      var startTime, endTime;
       SchemaWithPreSaveHook.pre('save', true, function hook(next, done) {
         setTimeout(function() {
           countPre++;
+          if (countPre === 1) startTime = Date.now();
+          else if (countPre === 4) endTime = Date.now();
           next();
           done();
-        }, 500);
+        }, 100);
       });
       SchemaWithPreSaveHook.post('save', function() {
         countPost++;
@@ -139,7 +141,8 @@ describe('model', function() {
         assert.ok(doc4);
         assert.equal(countPre, 4);
         assert.equal(countPost, 4);
-        done();
+        assert.ok(endTime - startTime < 4 * 100); // serial: >= 4 * 100 parallel: < 4 * 100
+        db.close(done);
       });
     });
 

test/model.geosearch.test.js

@@ -22,6 +22,8 @@ describe('model', function() {
   });
 
   describe('geoSearch', function() {
+    this.timeout(process.env.TRAVIS ? 8000 : 4500);
+
     it('works', function(done) {
       var db = start();
       var Geo = getModel(db);

test/model.populate.setting.test.js

@@ -24,6 +24,8 @@ var posts = 'blogposts_' + random(),
  */
 
 describe('model: populate:', function() {
+  this.timeout(process.env.TRAVIS ? 8000 : 4500);
+
   describe('setting populated paths (gh-570)', function() {
     var types = {
       ObjectId: DocObjectId,

test/model.populate.test.js

@@ -18,6 +18,8 @@ var DocObjectId = mongoose.Types.ObjectId;
  */
 
 describe('model: populate:', function() {
+  this.timeout(process.env.TRAVIS ? 8000 : 4500);
+
   var User;
   var Comment;
   var BlogPost;