Lots of minor fixes to deal with changes in 3.1.x that makes wired tiger default

Author: christkv

package.json

@@ -13,7 +13,7 @@
     "legacy"
   ],
   "dependencies": {
-      "mongodb-core": "1.2.2"
+      "mongodb-core": "1.2.3"
     , "readable-stream": "1.0.31"
     , "es6-promise": "2.1.1"
   },

test/functional/collection_tests.js

@@ -855,50 +855,6 @@ exports['Should correctly execute update with elemMatch field in selector'] = {
   }
 }
 
-/**
- * @ignore
- */
-exports['Should correctly execute find with elemMatch field in selector'] = {
-  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-
-  // The actual test we wish to run
-  test: function(configuration, test) {
-    var ObjectID = configuration.require.ObjectID;
-
-    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
-    db.open(function(err, db) {
-      db.collection('executeUpdateWithElemMatch').findOne({item: {$elemMatch: {name: 'my_name'}}}, function(err, result, full) {
-        test.equal(null, err);
-
-        db.close();
-        test.done();
-      });
-    });
-  }
-}
-
-/**
- * @ignore
- */
-exports['Should correctly execute remove with elemMatch field in selector'] = {
-  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-
-  // The actual test we wish to run
-  test: function(configuration, test) {
-    var ObjectID = configuration.require.ObjectID;
-
-    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
-    db.open(function(err, db) {
-      db.collection('executeUpdateWithElemMatch').remove({item: {$elemMatch: {name: 'my_name'}}}, function(err, result, full) {
-        test.equal(null, err);
-
-        db.close();
-        test.done();
-      });
-    });
-  }
-}
-
 /**
  * @ignore
  */
@@ -1033,7 +989,6 @@ exports['Should correctly list multipleCollections'] = {
               test.ok(names['test1'] != null);
               test.ok(names['test2'] != null);
               test.ok(names['test3'] != null);
-              test.ok(names['system.indexes'] != null);
 
               db.close();
               test.done();

test/functional/cursor_tests.js

@@ -989,7 +989,7 @@ exports.shouldHandleWhenLimitBiggerThanBatchSize = {
 
                 //4th
                 cursor.nextObject(function(err, items) {
-                  test.equal(2, cursor.bufferedCount());
+                  test.equal(null, err);
 
                   //No more
                   cursor.nextObject(function(err, items) {
@@ -1466,7 +1466,7 @@ exports.shouldCorrectlyExecuteEnsureIndexWithNoCallback = {
 
             // Find with sort
             collection.find().sort(['createdAt', 'asc']).toArray(function(err, items) {
-              if (err) logger.error("error in collection_info.find: " + err);
+              test.equal(null, err);
               test.equal(1, items.length);
               db.close();
               test.done();
@@ -1504,7 +1504,6 @@ exports['Should correctly execute count on cursor'] = {
 
         // insert all docs
         collection.insert(docs, configuration.writeConcernMax(), function(err, result) {
-          console.dir(err)
           test.equal(null, err);
           var total = 0;
           // Create a cursor for the content
@@ -1932,7 +1931,7 @@ exports.shouldCloseDeadTailableCursors = {
 
     db.open(function(err, db) {
 
-      var options = { capped: true, size: 8 };
+      var options = { capped: true, size: 10000000 };
       db.createCollection('test_if_dead_tailable_cursors_close', options, function(err, collection) {
         test.equal(null, err);
         var closed = false;
@@ -1943,7 +1942,8 @@ exports.shouldCloseDeadTailableCursors = {
           collection.insert({id: i});
         }
 
-        stream.on('data', function (doc) {});
+        stream.on('data', function (doc) {
+        });
 
         stream.on('error', function (err) {
           test.ok(err != null);

test/functional/db_tests.js

@@ -5,7 +5,7 @@
  */
 exports.shouldCorrectlyHandleIllegalDbNames = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db;
@@ -64,7 +64,7 @@ exports.shouldCorrectlyHandleIllegalDbNames = {
  */
 exports.shouldCorrectlyPerformAutomaticConnect = {
   metadata: { requires: { topology: 'single' } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var automatic_connect_client = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1, auto_reconnect:true});
@@ -100,7 +100,7 @@ exports.shouldCorrectlyPerformAutomaticConnect = {
  */
 exports.shouldCorrectlyPerformAutomaticConnectWithMaxBufferSize0 = {
   metadata: { requires: { topology: 'single' } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var automatic_connect_client = configuration.newDbInstance({w:1, bufferMaxEntries:0}, {poolSize:1, auto_reconnect:true});
@@ -132,7 +132,7 @@ exports.shouldCorrectlyPerformAutomaticConnectWithMaxBufferSize0 = {
  */
 exports.shouldCorrectlyHandleFailedConnection = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -150,7 +150,7 @@ exports.shouldCorrectlyHandleFailedConnection = {
  */
 exports.shouldCorrectlyResaveDBRef = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var DBRef = configuration.require.DBRef;
@@ -203,7 +203,7 @@ exports.shouldCorrectlyForceReindexOnCollection = {
   metadata: {
     requires: { topology: ["single", "replicaset"] }
   },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1, auto_reconnect:false});
@@ -253,7 +253,7 @@ exports.shouldCorrectlyForceReindexOnCollection = {
  */
 exports.shouldCorrectlyGetErrorDroppingNonExistingDb = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1, auto_reconnect:false});
@@ -278,7 +278,7 @@ exports.shouldCorrectlyGetErrorDroppingNonExistingDb = {
  */
 exports.shouldCorrectlyThrowWhenTryingToReOpenConnection = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1, auto_reconnect:false});
@@ -302,7 +302,7 @@ exports.shouldCorrectlyThrowWhenTryingToReOpenConnection = {
  */
 exports.shouldCorrectlyReconnectWhenError = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -328,7 +328,7 @@ exports.shouldCorrectlyReconnectWhenError = {
  */
 exports.shouldCorrectlyUseCursorWithListCollectionsCommand = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -349,7 +349,7 @@ exports.shouldCorrectlyUseCursorWithListCollectionsCommand = {
         // Create a collection
         db1.collection('test1').insertOne({a:1}, function() {
           test.equal(null, err);
-          
+
           // Get listCollections filtering out the name
           var cursor = db1.listCollections({name: 'test1'});
           cursor.toArray(function(err, names) {
@@ -370,7 +370,7 @@ exports.shouldCorrectlyUseCursorWithListCollectionsCommand = {
  */
 exports.shouldCorrectlyUseCursorWithListCollectionsCommandAndBatchSize = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -391,7 +391,7 @@ exports.shouldCorrectlyUseCursorWithListCollectionsCommandAndBatchSize = {
         // Create a collection
         db1.collection('test1').insertOne({a:1}, function() {
           test.equal(null, err);
-          
+
           // Get listCollections filtering out the name
           var cursor = db1.listCollections({name: 'test'}, {batchSize:1});
           cursor.toArray(function(err, names) {
@@ -412,7 +412,7 @@ exports.shouldCorrectlyUseCursorWithListCollectionsCommandAndBatchSize = {
  */
 exports['should correctly list collection names with . in the middle'] = {
   metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -433,7 +433,7 @@ exports['should correctly list collection names with . in the middle'] = {
         // Create a collection
         db1.collection('test.collection2').insertOne({a:1}, function() {
           test.equal(null, err);
-          
+
           // Get listCollections filtering out the name
           var cursor = db1.listCollections({name: /test.collection/});
           cursor.toArray(function(err, names) {
@@ -460,11 +460,11 @@ exports['should correctly list collection names with . in the middle'] = {
  * @ignore
  */
 exports['should correctly list collection names with batchSize 1 for 2.8 or higher'] = {
-  metadata: { requires: { 
-      topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] 
+  metadata: { requires: {
+      topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger']
     , mongodb: ">= 2.8.0"
   } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -485,7 +485,7 @@ exports['should correctly list collection names with batchSize 1 for 2.8 or high
         // Create a collection
         db1.collection('test.collection2').insertOne({a:1}, function() {
           test.equal(null, err);
-          
+
           // Get listCollections filtering out the name
           var cursor = db1.listCollections({name: /test.collection/}, {batchSize:1});
           cursor.toArray(function(err, names) {
@@ -505,11 +505,11 @@ exports['should correctly list collection names with batchSize 1 for 2.8 or high
  * @ignore
  */
 exports['should correctly execute close function in order'] = {
-  metadata: { requires: { 
-      topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] 
+  metadata: { requires: {
+      topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger']
     , mongodb: ">= 2.8.0"
   } },
-  
+
   // The actual test we wish to run
   test: function(configuration, test) {
     var Db = configuration.require.Db
@@ -522,9 +522,9 @@ exports['should correctly execute close function in order'] = {
       var items = [];
 
       items.push(1);
-      db.close(function(){ 
+      db.close(function(){
         test.equal(2, items.length);
-        test.done(); 
+        test.done();
       });
       items.push(2);
     });