NODE-529 Undefined options variable in Db.prototype.dropDatabase

Author: christkv

HISTORY.md

@@ -733,7 +733,6 @@ Db.prototype.dropCollection = function(name, callback) {
  */
 Db.prototype.dropDatabase = function(callback) {
   var self = this;
-  if(typeof options == 'function') callback = options, options = {};
   // Drop database command
   var cmd = {'dropDatabase':1};
 

lib/db.js

@@ -242,16 +242,19 @@ var connect = function(url, options, callback) {
       new Db(object.dbName, __server, {w:1, native_parser:false}).open(function(err, db) {
         // Update number of servers
         totalNumberOfServers = totalNumberOfServers - 1;
+        
         // If no error do the correct checks
         if(!err) {
           // Close the connection
           db.close();
           var isMasterDoc = db.serverConfig.isMasterDoc;
+          
           // Check what type of server we have
           if(isMasterDoc.setName) {
             totalNumberOfMongodServers++;
             setName = isMasterDoc.setName;
           }
+
           if(isMasterDoc.msg && isMasterDoc.msg == "isdbgrid") totalNumberOfMongosServers++;
         } else {
           error = err;

lib/mongo_client.js

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

package.json

@@ -71,7 +71,7 @@ exports.shouldCorrectlyRetrieveReplSetGetStatusWithPromises = {
  * @ignore
  */
 exports.shouldCorrectlyCallValidateCollectionUsingAuthenticatedMode = {
-  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+  metadata: { requires: { topology: ['single', 'ssl', 'heap', 'wiredtiger'] } },
 
   // The actual test we wish to run
   test: function(configure, test) {

test/functional/authentication_tests.js

@@ -246,20 +246,37 @@ exports.shouldCorrectlyHandleMultipleChunkGridStore = {
     var fs_client = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
 
     fs_client.open(function(err, fs_client) {
+      test.equal(null, err);
+
       fs_client.dropDatabase(function(err, done) {
+        test.equal(null, err);
+
         var gridStore = new GridStore(fs_client, "test_gs_multi_chunk", "w");
         gridStore.open(function(err, gridStore) {
+          test.equal(null, err);
+
           gridStore.chunkSize = 512;
           var file1 = ''; var file2 = ''; var file3 = '';
           for(var i = 0; i < gridStore.chunkSize; i++) { file1 = file1 + 'x'; }
           for(var i = 0; i < gridStore.chunkSize; i++) { file2 = file2 + 'y'; }
           for(var i = 0; i < gridStore.chunkSize; i++) { file3 = file3 + 'z'; }
 
           gridStore.write(file1, function(err, gridStore) {
+            console.dir(err)
+            test.equal(null, err);
+
             gridStore.write(file2, function(err, gridStore) {
+              test.equal(null, err);
+  
               gridStore.write(file3, function(err, gridStore) {
+                test.equal(null, err);
+    
                 gridStore.close(function(err, result) {
+                  test.equal(null, err);
+      
                   fs_client.collection('fs.chunks', function(err, collection) {
+                    test.equal(null, err);
+
                     collection.count(function(err, count) {
                       test.equal(3, count);
 

test/functional/gridfs_tests.js

@@ -367,8 +367,6 @@ exports.shouldCorrectlyHandleGeospatialIndexes = {
               test.equal(err,null);
 
               collection.insert({'loc': [200,200]}, configuration.writeConcernMax(), function(err, result) {
-                console.dir(err)
-                console.dir(result)
                 test.ok(err.errmsg.indexOf("point not in interval of") != -1);
                 test.ok(err.errmsg.indexOf("-180") != -1);
                 test.ok(err.errmsg.indexOf("180") != -1);

test/functional/index_tests.js

@@ -352,3 +352,26 @@ exports['Should fail due to wrong uri user:password@localhost'] = {
     }
   }
 }
+
+/**
+ * @ignore
+ */
+exports["correctly timeout MongoClient connect using custom connectTimeoutMS"] = {
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var MongoClient = configuration.require.MongoClient;
+
+    var start = new Date();
+
+    MongoClient.connect('mongodb://example.com/test?connectTimeoutMS=1000&maxPoolSize=1', function(err, db) {
+      // db.close();
+
+      var end = new Date();
+      console.dir(end.getTime() - start.getTime())
+
+      test.done();
+    });
+  }
+}

test/functional/mongo_client_tests.js

@@ -4164,21 +4164,10 @@ exports.shouldCorrectlyRetrieveReplSetGetStatusWithGenerators = {
       // Use the admin database for the operation
       var adminDb = db.admin();
 
-      // Add the new user to the admin database
-      var result = yield adminDb.addUser('admin14', 'admin14');
-      test.ok(result != null);
-
-      // Authenticate using the newly added user
-      var result = yield adminDb.authenticate('admin14', 'admin14');
-      test.equal(true, result);
-
       // Retrive the server Info, returns error if we are not
       // running a replicaset
       yield adminDb.replSetGetStatus();
 
-      var result = yield adminDb.removeUser('admin14');
-      test.ok(result);
-
       db.close();
       test.done();
     });

test/functional/operation_generators_example_tests.js

@@ -366,7 +366,7 @@ if(argv.t == 'functional') {
         port: 31000,
         host: 'localhost',
         url: "mongodb://%slocalhost:31000/integration_tests?rs_name=rs",
-        writeConcernMax: {w: 'majority', wtimeout: 5000},
+        writeConcernMax: {w: 'majority', wtimeout: 30000},
         replicasetName: 'rs',
 
         topology: function(host, port, serverOptions) {
@@ -395,7 +395,7 @@ if(argv.t == 'functional') {
         port: 50000,
         host: 'localhost',
         url: "mongodb://%slocalhost:50000/integration_tests",
-        writeConcernMax: {w: 'majority', wtimeout: 5000},
+        writeConcernMax: {w: 'majority', wtimeout: 30000},
 
         topology: function(host, port, serverOptions) {
           var m = require('../');