SERVER-18239 dumpauth.js should use correct db/collection names

Signed-off-by: Ernie Hershey <ernie.hershey@10gen.com>
(cherry picked from commit 3140bfa914859b05ae04f99474b34c73c1fcb019)

Conflicts:
	jstests/tool/dumpauth.js

1 files changed, 12 insertions, 12 deletions

diff --git a/jstests/tool/dumpauth.js b/jstests/tool/dumpauth.js
index 7ae165f5ce1..5edfe1e9f52 100644
--- a/jstests/tool/dumpauth.js
+++ b/jstests/tool/dumpauth.js
@@ -1,37 +1,37 @@
 // dumpauth.js
 // test mongodump with authentication
-port = allocatePorts( 1 )[ 0 ];
-baseName = "tool_dumpauth";
 
-m = startMongod( "--auth", "--port", port, "--dbpath", MongoRunner.dataPath + baseName, "--nohttpinterface", "--bind_ip", "127.0.0.1" );
-db = m.getDB( "admin" );
+var m = MongoRunner.runMongod({auth: "", bind_ip: "127.0.0.1"});
+var dbName = "admin"
+var colName = "testcol"
+db = m.getDB(dbName);
 
 db.createUser({user:  "testuser" , pwd: "testuser", roles: jsTest.adminUserRoles});
 assert( db.auth( "testuser" , "testuser" ) , "auth failed" );
 
-t = db[ baseName ];
+t = db[colName];
 t.drop();
 
 for(var i = 0; i < 100; i++) {
-  t["testcol"].save({ "x": i });
+  t.save({ "x": i });
 }
 
 x = runMongoProgram( "mongodump",
-                     "--db", baseName,
+                     "--db", dbName,
                      "--authenticationDatabase=admin",
                      "-u", "testuser",
                      "-p", "testuser",
-                     "-h", "127.0.0.1:"+port,
-                     "--collection", "testcol" );
+                     "-h", "127.0.0.1:"+m.port,
+                     "--collection", colName);
 assert.eq(x, 0, "mongodump should succeed with authentication");
 
 // SERVER-5233: mongodump with authentication breaks when using "--out -"
 x = runMongoProgram( "mongodump",
-                     "--db", baseName,
+                     "--db", dbName,
                      "--authenticationDatabase=admin",
                      "-u", "testuser",
                      "-p", "testuser",
-                     "-h", "127.0.0.1:"+port,
-                     "--collection", "testcol",
+                     "-h", "127.0.0.1:"+m.port,
+                     "--collection", colName,
                      "--out", "-" );
 assert.eq(x, 0, "mongodump should succeed with authentication while using '--out'");