Fixes to make all the tests passing

christkv · Nov 7, 2011 · 0241cad · 0241cad
1 parent 1bfca3d
commit 0241cad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/lib/mongodb/db.js b/lib/mongodb/db.js
@@ -79,18 +79,12 @@ var Db = exports.Db = function(databaseName, serverConfig, options) {
 var reaper = function(dbInstance, timeout) {
   return function() {
     // console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! reaper running")
-    // Only trigger reaper if it's still valid
+    // Only trigger reaper if it's still valid and we have a proper connection pool
     if(dbInstance.reaperIntervalId != null) {
-      // console.dir(dbInstance._mongodbHandlers)
-      // console.log(dbInstance.serverConfig.isConnected())
-      // console.log(dbInstance.reaperIntervalId)
-      // console.log(dbInstance.tag)
-
       // Current time
       var currentTime = new Date().getTime();
-
       // If it's no longer connected clear out the interval
-      if(!dbInstance.serverConfig.isConnected() && dbInstance.reaperIntervalId != null) {
+      if(dbInstance.serverConfig.connectionPool != null && !dbInstance.serverConfig.isConnected() && dbInstance.reaperIntervalId != null) {
         // Clear the interval
         clearInterval(dbInstance.reaperIntervalId);
         // this._mongodbHandlers = {_mongodbCallbacks : {}, _notReplied : {}};  

diff --git a/test/auxilliary/authentication_test.js b/test/auxilliary/authentication_test.js
@@ -143,7 +143,6 @@ var tests = testCase({
         db1.collection('stuff', function(err, collection) {
 
           collection.find().toArray(function(err, items) {
-            test.done();
             test.ok(err == null);
             test.equal(1, items.length);
 
@@ -174,8 +173,7 @@ var tests = testCase({
       },
 
       function logoutDb2(err, result) {
-        test.ok(err != null);
-
+        test.ok(err != null);      
         db2.logout(this);
       },
 
@@ -185,6 +183,10 @@ var tests = testCase({
           collection.insert({a:2}, {safe:true}, function(err, result) {
             test.ok(err != null);
             test.done();
+            // Close all connections
+            db1.close();
+            db2.close();
+            admin.close();
           });
         });                      
       }

diff --git a/test/tools/server_manager.js b/test/tools/server_manager.js
@@ -34,6 +34,9 @@ ServerManager.prototype.start = function(killall, callback) {
   // Create start command
   var startCmd = generateStartCmd({log_path: self.log_path, 
     db_path: self.db_path, port: self.port, durable: self.durable, auth:self.auth});
+
+  // console.log("----------------------------------------------------------------------- start")
+  // console.log(startCmd)
 
   exec(killall ? 'killall mongod' : '', function(err, stdout, stderr) {
     if(self.purgedirectories) {