Added scram test, fixed issue in unordered bulk and added scram env to runner

Author: christkv

lib/bulk/unordered.js

@@ -237,7 +237,7 @@ var UnorderedBulkOperation = function(topology, collection, options) {
 
     // We have an array of documents
     if(Array.isArray(document)) {
-    	throw util.toError("operation passed in cannot be an Array");
+    	throw utils.toError("operation passed in cannot be an Array");
     } else {
       currentBatch.operations.push(document);
       currentBatch.originalIndexes.push(currentIndex);
@@ -372,7 +372,7 @@ var UnorderedBulkOperation = function(topology, collection, options) {
    * @return {null}
    */
 	this.execute = function(_writeConcern, callback) {
-		if(executed) throw util.toError("batch cannot be re-executed");
+		if(executed) throw utils.toError("batch cannot be re-executed");
 		if(typeof _writeConcern == 'function') {
 			callback = _writeConcern;
 		} else {

test/functional/scram_tests.js

@@ -2,38 +2,59 @@
  * rm -rf data; mkdir data; mongod --dbpath=./data --setParameter authenticationMechanisms=SCRAM-SHA-1 --auth
  * @ignore
  */
-exports['should correctly create a new user and authenticate using scram'] = {
-  metadata: { requires: { topology: ['scram'], mongodb: ">=2.7.5" } },
+exports['Should correctly authenticate against scram'] = {
+  metadata: { requires: { topology: 'scram', mongodb: '>=2.7.5' } },
 
   // The actual test we wish to run
   test: function(configuration, test) {
-    var Buffer = require('buffer').Buffer
-      , BSON = require('bson').pure().BSON
-      , MongoClient = configuration.require.MongoClient;
-      // console.dir(BSON)
+    var Db = configuration.require.Db
+      , MongoClient = configuration.require.MongoClient
+      , Server = configuration.require.Server;
 
     // User and password
     var user = 'test';
     var password = 'test';
 
-    // var db = configuration.newDbInstance({w:1}, {poolSize:1});
-    // db.open(function(err, db) {
+    // Connect to the server
     MongoClient.connect('mongodb://localhost:27017/test', function(err, db) {
       test.equal(null, err);
 
+      // Create an admin user
       db.admin().addUser(user, password, function(err, result) {
         test.equal(null, err);
         db.close();
 
         // Attempt to reconnect authenticating against the admin database
-        MongoClient.connect('mongodb://test:test@localhost:27017/test?authMechanism=SCRAM-SHA-1&authSource=admin&maxPoolSize=1', function(err, db) {
+        MongoClient.connect('mongodb://test:test@localhost:27017/test?authMechanism=SCRAM-SHA-1&authSource=admin&maxPoolSize=5', function(err, db) {
           test.equal(null, err);
-          console.dir(db)
 
-          db.close();
-          test.done();
+          db.collection('test').insert({a:1}, function(err, r) {
+            test.equal(null, err);
+            test.ok(r != null);
+
+            // Wait for a reconnect to happen
+            db.serverConfig.once('reconnect', function() {
+
+              // Perform an insert after reconnect
+              db.collection('test').insert({a:1}, function(err, r) {
+                test.equal(null, err);
+                test.ok(r != null);
+    
+                // Remove the user
+                db.admin().removeUser(user, function(err, r) {
+                  test.equal(null, err);
+
+                  db.close();
+                  test.done();
+                });
+              });
+            });
+
+            // Attempt disconnect again
+            db.serverConfig.connections()[0].destroy();
+          });
         });
       });
     });
   }
-}
+}

test/runner.js

@@ -384,11 +384,26 @@ if(argv.t == 'functional') {
         return new m.Server(host, port, serverOptions);
       }, 
     });
-  } else if(argv.e == 'ldap' || argv.e == 'kerberos' || argv.e == 'scram') {
+  } else if(argv.e == 'ldap' || argv.e == 'kerberos') {
     startupOptions.skipStartup = true;
     startupOptions.skipRestart = true;
     startupOptions.skipShutdown = true;
     startupOptions.skip = true;
+  } else if(argv.e == 'scram') {
+    // Create ssl server
+    config = createConfiguration({
+        fork:null
+      , auth: null
+      , setParameter: 'authenticationMechanisms=SCRAM-SHA-1'
+
+      , topology: function(host, port, serverOptions) {
+        var m = require('../');
+        host = host || 'localhost'; port = port || 27017;
+        serverOptions = shallowClone(serverOptions);
+        serverOptions.poolSize = 1;
+        return new m.Server(host, port, serverOptions);
+      }, 
+    });    
   }
 
   // If we have a test we are filtering by